1
0
mirror of https://github.com/git/git.git synced 2024-09-28 23:11:39 +02:00

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>
This commit is contained in:
Junio C Hamano 2005-10-04 17:44:17 -07:00
parent 129056370a
commit 0b34379a8d

2
diff.h

@ -103,7 +103,7 @@ extern void diff_flush(struct diff_options*);
/* these are not diff-raw status letters proper, but used by /* these are not diff-raw status letters proper, but used by
* diffcore-filter insn to specify additional restrictions. * diffcore-filter insn to specify additional restrictions.
*/ */
#define DIFF_STATUS_FILTER_AON 'A' #define DIFF_STATUS_FILTER_AON '*'
#define DIFF_STATUS_FILTER_BROKEN 'B' #define DIFF_STATUS_FILTER_BROKEN 'B'
#endif /* DIFF_H */ #endif /* DIFF_H */