diff options
author | Junio C Hamano <junkio@cox.net> | 2005-06-11 20:57:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:40:20 -0700 |
commit | f2ce9fde57513af026e0641073a6781a086251d5 (patch) | |
tree | 5a6e33c33717880fc6af64af378bb373bdf8e065 /convert-cache.c | |
parent | [PATCH] diff-tree: --find-copies-harder (diff) | |
download | tgif-f2ce9fde57513af026e0641073a6781a086251d5.tar.xz |
[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>
Diffstat (limited to 'convert-cache.c')
0 files changed, 0 insertions, 0 deletions