X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-helper.txt;h=26f5f3950a8d4729db4e1487b0b27e00aa9afd6f;hb=ee6566e8d70da682ac4926dd8a67ac821b2c1743;hp=f879ed98925033763263f1f9f38b514aa1d16346;hpb=902b92e00e491a60d55c4b2bce122903b8347f34;p=git.git diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index f879ed98..26f5f395 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -1,5 +1,5 @@ git-diff-helper(1) -======================= +================== v0.1, May 2005 NAME @@ -9,11 +9,11 @@ git-diff-helper - Generates patch format output for git-diff-* SYNOPSIS -------- -'git-diff-helper' [-z] [-R] +'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,23 +21,27 @@ 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. +-S:: + Look for differences that contains the change in . - git-diff-cache | git-diff-helper -R file.c +--pickaxe-all:: + When -S finds a change, show all the changes in that + changeset, not just the files that contains the change + in . -would show a diff to bring the working file back to what is in the . +-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 ------ -Written by Linus Torvalds +Written by Junio C Hamano + Documentation --------------