X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-diff-helper.txt;h=d826deb42e1974b57b07ddd09aae38295ac6b654;hb=9b011b2fe5379f76c53f20b964d7a3cecb9d8c79;hp=58f27172a9e23bf43f3bae6eb184e72425715b84;hpb=99665af5c0be0fe4319b39183e84917993153576;p=git.git diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt index 58f27172..d826deb4 100644 --- a/Documentation/git-diff-helper.txt +++ b/Documentation/git-diff-helper.txt @@ -1,15 +1,15 @@ -git-diff-tree-helper(1) -======================= +git-diff-helper(1) +================== v0.1, May 2005 NAME ---- -git-diff-tree-helper - Generates patch format output for git-diff-* +git-diff-helper - Generates patch format output for git-diff-* SYNOPSIS -------- -'git-diff-tree-helper' [-z] [-R] +'git-diff-helper' [-z] [-S] [-O] DESCRIPTION ----------- @@ -21,14 +21,17 @@ 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-tree-helper -R file.c -+ -would show a diff to bring the working file back to what is in the . +--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 -------- @@ -37,7 +40,8 @@ The section on generating patches in link:git-diff-cache.html[git-diff-cache] Author ------ -Written by Linus Torvalds +Written by Junio C Hamano + Documentation --------------