diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-23 14:55:33 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 16:23:10 -0700 |
| commit | b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 (patch) | |
| tree | 8c15995be05c108072397d41d0454d6737509f7b /Documentation/git-diff-helper.txt | |
| parent | git-apply: parse the diff headers (both traditional and new) (diff) | |
| download | tgif-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.tar.xz | |
[PATCH] diff-raw format update take #2.
This changes the diff-raw format again, following the mailing
list discussion. The new format explicitly expresses which one
is a rename and which one is a copy.
The documentation and tests are updated to match this change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-helper.txt')
| -rw-r--r-- | Documentation/git-diff-helper.txt | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index 2036c6cc1b..90342c9125 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -9,7 +9,7 @@ git-diff-helper - Generates patch format output for git-diff-* SYNOPSIS -------- -'git-diff-helper' [-z] [-R] [-M] [-C] [-S<string>] +'git-diff-helper' [-z] [-S<string>] DESCRIPTION ----------- @@ -21,22 +21,6 @@ OPTIONS -z:: \0 line termination on input --R:: - Output diff in reverse. This is useful for displaying output from - "git-diff-cache" which always compares tree with cache or working - file. E.g. - - git-diff-cache <tree> | git-diff-helper -R file.c - - would show a diff to bring the working file back to what - is in the <tree>. - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - -S<string>:: Look for differences that contains the change in <string>. |