From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Gerald Gutierrez <ggmlfs@gmail.com>, git@vger.kernel.org
Subject: Re: git with custom diff for commits
Date: Tue, 18 Dec 2007 00:08:43 +0100 [thread overview]
Message-ID: <vpq1w9kaphg.fsf@bauges.imag.fr> (raw)
In-Reply-To: <Pine.LNX.4.64.0712172300510.9446@racer.site> (Johannes Schindelin's message of "Mon\, 17 Dec 2007 23\:01\:37 +0000 \(GMT\)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Hi,
>
> On Mon, 17 Dec 2007, Gerald Gutierrez wrote:
>
>> I do a nightly mysqldump of a database and check it into a git
>> repository. mysqldump generates a timestamp as part of that output which
>> is causing git to think that the file changes every night when it really
>> doesn't. The timestamp is simply in an SQL comment.
>>
>> So what I'd like to do is teach git to ignore that particular SQL
>> timestamp comment. I've tried to set up an external diff script that
>> runs diff -I "<<sql timestamp comment>>" that effectively ignores the
>> timestamp. While this works with "git diff", it seems when git commits,
>> it still sees the differences.
>>
>> How do I properly teach git to ignore these types of differences?
>
> You might be interested in reading Documentation/gitattributes.txt, look
> for "diff driver".
It will show an empty output for "git diff", but I doubt thit will
change anything at commit time. Probably the "filter" thing on the
same file (also "man gitattributes") can help though.
--
Matthieu
next prev parent reply other threads:[~2007-12-17 23:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-17 22:56 git with custom diff for commits Gerald Gutierrez
2007-12-17 23:01 ` Johannes Schindelin
2007-12-17 23:08 ` Matthieu Moy [this message]
2007-12-17 23:11 ` Johannes Schindelin
2007-12-17 23:26 ` Junio C Hamano
2007-12-18 8:57 ` Matthieu Moy
2007-12-18 9:25 ` Junio C Hamano
2007-12-18 20:35 ` Gerald Gutierrez
2007-12-18 20:40 ` Junio C Hamano
2007-12-18 20:48 ` Gerald Gutierrez
2007-12-18 21:27 ` Johannes Schindelin
2007-12-18 21:51 ` Gerald Gutierrez
2007-12-18 22:00 ` Johannes Schindelin
2007-12-18 21:38 ` Junio C Hamano
2007-12-18 21:51 ` Matthieu Moy
2007-12-18 22:27 ` Gerald Gutierrez
2007-12-18 22:48 ` Johannes Schindelin
2007-12-18 23:52 ` Martin Langhoff
2007-12-19 9:01 ` Matthieu Moy
2007-12-19 12:09 ` Johannes Schindelin
2007-12-19 12:13 ` Matthieu Moy
2007-12-19 9:13 ` Matthieu Moy
2007-12-18 22:29 ` Gerald Gutierrez
2007-12-17 23:27 ` Gerald Gutierrez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq1w9kaphg.fsf@bauges.imag.fr \
--to=matthieu.moy@imag.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=ggmlfs@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.