summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1290563)
raw | patch | inline | side by side (parent: 1290563)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 5 Oct 2005 00:44:17 +0000 (17:44 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 5 Oct 2005 00:44:17 +0000 (17:44 -0700) |
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>
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>
diff.h | patch | blob | history |
index 7f4079c87104afd8bda23046942121b7d3ff62ee..2f4a7b463b699e65848656279287e2d8e2048c16 100644 (file)
--- a/diff.h
+++ b/diff.h
/* 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 */