[PATCH] diff-raw format update take #2.
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 23, 2005, 22:08 UTC
- Message-ID
- <7vr7fx1tpm.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <7vy8a51uay.fsf_-_@assigned-by-dhcp.cox.net>
Addendum.
------------ Document the diff-helper changes.
Now diff-helper is simple diff-raw to patch format converter that does not take -R/-M/-C, drop the description of these options from the documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net> --- cd /opt/packrat/playpen/public/in-place/git/git.junio/ jit-diff # - HEAD: diff-raw format update take #2. # + (working tree)
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -9,7 +9,7 @@ git-diff-helper - Generates patch format 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>. Compilation finished at Mon May 23 15:06:31