diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-22 02:42:18 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 05:49:19 (GMT) |
| commit | 81e50eabf06dd68e8e62a9b697eaf60904c58b22 (patch) | |
| tree | f7cf8566f2a72a669b6e4bbaca0cf6ca5a781dd3 /Documentation/git-diff-tree.txt | |
| parent | 38c6f78059c3060db6f94b24f4a90063a91090d2 (diff) | |
| download | git-81e50eabf06dd68e8e62a9b697eaf60904c58b22.zip git-81e50eabf06dd68e8e62a9b697eaf60904c58b22.tar.gz git-81e50eabf06dd68e8e62a9b697eaf60904c58b22.tar.bz2 | |
[PATCH] The diff-raw format updates.
Update the diff-raw format as Linus and I discussed, except that
it does not use sequence of underscore '_' letters to express
nonexistence. All '0' mode is used for that purpose instead.
The new diff-raw format can express rename/copy, and the earlier
restriction that -M and -C _must_ be used with the patch format
output is no longer necessary. The patch makes -M and -C flags
independent of -p flag, so you need to say git-whatchanged -M -p
to get the diff/patch format.
Updated are both documentations and tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index bdc8d5a..ea680cc 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -34,11 +34,10 @@ OPTIONS git-diff-tree, this flag implies '-r' as well. -M:: - Detect renames; implies -p, in turn implying also '-r'. + Detect renames. -C:: - Detect copies as well as renames; implies -p, in turn - implying also '-r'. + Detect copies as well as renames. -R:: Output diff in reverse. |