]> git.ipfire.org Git - thirdparty/git.git/commit
[PATCH] Add --diff-filter= output restriction to diff-* family.
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Jun 2005 03:57:13 +0000 (20:57 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 13 Jun 2005 03:40:20 +0000 (20:40 -0700)
commitf2ce9fde57513af026e0641073a6781a086251d5
tree5a6e33c33717880fc6af64af378bb373bdf8e065
parenta7ca65405c364e674cf4359b07ae959d4ece01ab
[PATCH] Add --diff-filter= output restriction to diff-* family.

This is a halfway between debugging aid and a helper to write an
ultra-smart merge scripts.  The new option takes a string that
consists of a list of "status" letters, and limits the diff
output to only those classes of changes, with two exceptions:

 - A broken pair (aka "complete rewrite"), does not match D
   (deleted) or N (created).  Use B to look for them.

 - The letter "A" in the diff-filter string does not match
   anything itself, but causes the entire diff that contains
   selected patches to be output (this behaviour is similar to
   that of --pickaxe-all for the -S option).

For example,

    $ git-rev-list HEAD |
      git-diff-tree --stdin -s -v -B -C --diff-filter=BCR

shows a list of commits that have complete rewrite, copy, or
rename.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff-cache.c
diff-files.c
diff-helper.c
diff-stages.c
diff-tree.c
diff.c
diff.h