From: Jakub Narebski <jnareb@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, gitster@pobox.com,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [HALF A PATCH] Teach the '--exclude' option to 'diff --no-index'
Date: Fri, 20 Feb 2009 10:34:30 -0800 (PST) [thread overview]
Message-ID: <m3skm9rm6h.fsf@localhost.localdomain> (raw)
In-Reply-To: <alpine.DEB.1.00.0902201555490.6302@intel-tinevez-2-302>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Fri, 20 Feb 2009, Jeff King wrote:
>
> > But more seriously, how would a user expect this to interact with
> > .gitignore? I know gitignore is about ignoring untracked files, but I
> > can't help but feel the two have something in common. But maybe not. I'm
> > sick today and my brain is not working very well.
>
> I think that the -x option with regular (not --no-index) diff would be
> a little different. .gitignore is for "git add" time, while "git diff"
> happily ignores .gitignore.
>
> Besides, the -x option only works on the basenames (as I implemented it;
> no idea if GNU diff works the same way, but from Michael's patch it looks
> like it does).
Info: (diff.info.gz)diff Options
`-x PATTERN'
`--exclude=PATTERN'
When comparing directories, ignore files and subdirectories whose
basenames match PATTERN. *Note Comparing Directories::.
`-X FILE'
`--exclude-from=FILE'
When comparing directories, ignore files and subdirectories whose
basenames match any pattern contained in FILE. *Note Comparing
Directories::.
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2009-02-20 18:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-20 5:18 [PATCH 0/4] Add more tests of cvsimport Michael Haggerty
2009-02-20 5:18 ` [PATCH 1/4] Start a library for cvsimport-related tests Michael Haggerty
2009-02-20 5:18 ` [PATCH 2/4] Use CVS's -f option if available (ignore user's ~/.cvsrc file) Michael Haggerty
2009-02-20 5:18 ` [PATCH 3/4] Test contents of entire cvsimported "master" tree contents Michael Haggerty
2009-02-20 5:18 ` [PATCH 4/4] Add some tests of git-cvsimport's handling of vendor branches Michael Haggerty
2009-02-20 6:25 ` [PATCH 0/4] Add more tests of cvsimport Jeff King
2009-02-20 7:40 ` Junio C Hamano
2009-02-20 11:24 ` Michael Haggerty
2009-02-20 14:12 ` [HALF A PATCH] Teach the '--exclude' option to 'diff --no-index' Johannes Schindelin
2009-02-20 14:53 ` Jeff King
2009-02-20 15:03 ` Johannes Schindelin
2009-02-20 18:34 ` Jakub Narebski [this message]
2009-02-20 20:04 ` Johannes Schindelin
2009-02-20 16:34 ` Junio C Hamano
2009-02-24 16:15 ` Johannes Schindelin
2009-02-24 17:01 ` Junio C Hamano
2009-02-20 10:21 ` [PATCH 0/4] Add more tests of cvsimport Michael Haggerty
2009-02-20 15:00 ` Jeff King
2009-02-20 21:26 ` Samuel Lucas Vaz de Mello
2009-02-21 6:32 ` Michael Haggerty
2009-02-20 8:27 ` Ferry Huberts (Pelagic)
2009-02-21 13:05 ` Michael Haggerty
2009-02-21 13:19 ` Ferry Huberts (Pelagic)
2009-02-22 16:49 ` 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=m3skm9rm6h.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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).