summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-files.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-21 19:42:18 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 22:49:19 -0700
commit81e50eabf06dd68e8e62a9b697eaf60904c58b22 (patch)
treef7cf8566f2a72a669b6e4bbaca0cf6ca5a781dd3 /Documentation/git-diff-files.txt
parent38c6f78059c3060db6f94b24f4a90063a91090d2 (diff)
downloadgit-81e50eabf06dd68e8e62a9b697eaf60904c58b22.tar.gz
[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-files.txt')
-rw-r--r--Documentation/git-diff-files.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 51a3d0fcd6..9f9bb14531 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -30,10 +30,10 @@ OPTIONS
Output diff in reverse.
-M::
- Detect renames; implies -p.
+ Detect renames.
-C::
- Detect copies as well as renames; implies -p.
+ Detect copies as well as renames.
-S<string>::
Look for differences that contains the change in <string>.