]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-diff-helper.txt
[PATCH] Make "git resolve" less scary
[thirdparty/git.git] / Documentation / git-diff-helper.txt
CommitLineData
902b92e0 1git-diff-helper(1)
7984eabe 2==================
2cf565c5
DG
3v0.1, May 2005
4
5NAME
6----
902b92e0 7git-diff-helper - Generates patch format output for git-diff-*
2cf565c5
DG
8
9
10SYNOPSIS
11--------
ce240675 12'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
2cf565c5
DG
13
14DESCRIPTION
15-----------
16Reads output from "git-diff-cache", "git-diff-tree" and "git-diff-files" and
17generates patch format output.
18
19OPTIONS
20-------
21-z::
22 \0 line termination on input
23
52e95789
JH
24-S<string>::
25 Look for differences that contains the change in <string>.
26
232b75ab
JH
27--pickaxe-all::
28 When -S finds a change, show all the changes in that
29 changeset, not just the files that contains the change
30 in <string>.
31
ce240675
JH
32-O<orderfile>::
33 Output the patch in the order specified in the
34 <orderfile>, which has one shell glob pattern per line.
52e95789 35
c1bdacf9
DG
36See Also
37--------
38The section on generating patches in link:git-diff-cache.html[git-diff-cache]
2cf565c5
DG
39
40
41Author
42------
915838c3
JH
43Written by Junio C Hamano <junkio@cox.net>
44
2cf565c5
DG
45
46Documentation
47--------------
48Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
49
50GIT
51---
52Part of the link:git.html[git] suite
53