diff options
author | Junio C Hamano <junkio@cox.net> | 2005-10-04 17:44:17 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-10-04 17:44:17 -0700 |
commit | 0b34379a8da82061308b7a22d0caa1834d579f48 (patch) | |
tree | 2a73ed70b36ea24df01e293a47165cb293f3c2d2 /diff.h | |
parent | 129056370abff1cc0d347b98fe88afc44a6cb8c0 (diff) | |
download | git-0b34379a8da82061308b7a22d0caa1834d579f48.tar.gz git-0b34379a8da82061308b7a22d0caa1834d579f48.tar.xz |
Fix diff-filter All-Or-None mark.
When we updated the marker for new files from 'N' to 'A', we forgot to
notice that the letter is already taken by the All-Or-None mark.
Change the All-Or-None marker to '*' to resolve this conflict.
git-diff-tree -r --diff-filter='R*' -M
shows all the changes (not just renames) that are contained in commits
that have renames, in comparison with:
git-diff-tree -r --diff-filter='R' -M
shows the same set of changes but the diff output are limited only to
renaming changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -103,7 +103,7 @@ extern void diff_flush(struct diff_options*); /* these are not diff-raw status letters proper, but used by * diffcore-filter insn to specify additional restrictions. */ -#define DIFF_STATUS_FILTER_AON 'A' +#define DIFF_STATUS_FILTER_AON '*' #define DIFF_STATUS_FILTER_BROKEN 'B' #endif /* DIFF_H */ |