From: Jay Soffian <jaysoffian@gmail.com>
To: git <git@vger.kernel.org>
Subject: diff attribute ignored by show and log -p
Date: Wed, 16 Dec 2009 23:46:56 -0500 [thread overview]
Message-ID: <76718490912162046k36e2a275gaf7672b38c7a63e4@mail.gmail.com> (raw)
% cat .git/info/attributes
*.xib diff=xibdiff
% cat $(git config diff.xibdiff.command)
#!/bin/sh
trap "rm -f \"$2.tmp\" \"$5.tmp\"" 0 1 2 3 15
ibtool --all "$2" > "$2".tmp
ibtool --all "$5" > "$5".tmp
colordiff -u "$2.tmp" "$5.tmp"
Works great for things like:
% git diff <commit1> <commit2> -- /path/to/*.xib
But is apparently ignored by "git log -p" and "git show" which just
use internal diff. Is this behavior intentional?
j.
next reply other threads:[~2009-12-17 4:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-17 4:46 Jay Soffian [this message]
2009-12-17 5:23 ` diff attribute ignored by show and log -p Jay Soffian
2009-12-17 13:17 ` Nanako Shiraishi
2009-12-17 16:44 ` Jay Soffian
2009-12-17 20:24 ` Jeff King
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=76718490912162046k36e2a275gaf7672b38c7a63e4@mail.gmail.com \
--to=jaysoffian@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox