git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jay Soffian <jaysoffian@gmail.com>
To: git <git@vger.kernel.org>
Subject: combined diff seems to ignore diff attribute
Date: Tue, 7 Sep 2010 20:33:02 -0400	[thread overview]
Message-ID: <AANLkTinbaQbS=pU44sSCf7+_3bLrREpehYQCiV5CFuVB@mail.gmail.com> (raw)

I want to squelch the output of a particular file type because it's
too noisy (Mac OS X xib files). So I added:

*.xib -diff

to .git/info/attributes

which works fine except for --cc output. Is this a bug, oversight, or
my stupidity?

$ git log -p --cc
commit fdffb6081c2c09f55e2fdb6a02905054484965ed
Merge: 947da38 dcce084
Author: Jay Soffian <jaysoffian@gmail.com>
Date:   Tue Sep 7 20:28:44 2010 -0400

    Merge branch 'side'

    * side:
      side

    Conflicts:
        file.xib

diff --cc file.xib
index 1f7391f,2299c37..0f8f0c9
--- a/file.xib
+++ b/file.xib
@@@ -1,1 -1,1 +1,1 @@@
- master
 -side
++master side

commit dcce0846b493edc0ab4301fae6c3910a6dd31ed8
Author: Jay Soffian <jaysoffian@gmail.com>
Date:   Tue Sep 7 20:28:17 2010 -0400

    side

diff --git a/file.xib b/file.xib
index e69de29..2299c37 100644
Binary files a/file.xib and b/file.xib differ

commit 947da38b8ec84527aa60c0e8bca7279e6b2bb0af
Author: Jay Soffian <jaysoffian@gmail.com>
Date:   Tue Sep 7 20:28:09 2010 -0400

    master

diff --git a/file.xib b/file.xib
index e69de29..1f7391f 100644
Binary files a/file.xib and b/file.xib differ

commit 419c5c0dc0ae4d548227d85ded2d8abc42001720
Author: Jay Soffian <jaysoffian@gmail.com>
Date:   Tue Sep 7 20:27:49 2010 -0400

    initial

diff --git a/file.xib b/file.xib
new file mode 100644
index 0000000..e69de29

             reply	other threads:[~2010-09-08  0:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-08  0:33 Jay Soffian [this message]
2010-09-08  4:32 ` combined diff seems to ignore diff attribute Junio C Hamano

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='AANLkTinbaQbS=pU44sSCf7+_3bLrREpehYQCiV5CFuVB@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;
as well as URLs for NNTP newsgroup(s).