X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-helper.txt;h=26f5f3950a8d4729db4e1487b0b27e00aa9afd6f;hb=4d3fe0c5f342d0b00209916cf6951c2f8db414d2;hp=2036c6cc1b6abac359e567ae4e75297640e3e41f;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index 2036c6cc..26f5f395 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -9,11 +9,11 @@ git-diff-helper - Generates patch format output for git-diff-* SYNOPSIS -------- -'git-diff-helper' [-z] [-R] [-M] [-C] [-S] +'git-diff-helper' [-z] [-S] [-O] DESCRIPTION ----------- -Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and +Reads output from "git-diff-index", "git-diff-tree" and "git-diff-files" and generates patch format output. OPTIONS @@ -21,29 +21,21 @@ 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 | git-diff-helper -R file.c - - would show a diff to bring the working file back to what - is in the . - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - -S:: Look for differences that contains the change in . +--pickaxe-all:: + When -S finds a change, show all the changes in that + changeset, not just the files that contains the change + in . + +-O:: + Output the patch in the order specified in the + , which has one shell glob pattern per line. See Also -------- -The section on generating patches in link:git-diff-cache.html[git-diff-cache] +The section on generating patches in link:git-diff-index.html[git-diff-index] Author