projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Rewrite read-tree
[git.git]
/
Documentation
/
git-diff-helper.txt
diff --git
a/Documentation/git-diff-helper.txt
b/Documentation/git-diff-helper.txt
index
f879ed9
..
26f5f39
100644
(file)
--- a/
Documentation/git-diff-helper.txt
+++ b/
Documentation/git-diff-helper.txt
@@
-1,5
+1,5
@@
git-diff-helper(1)
git-diff-helper(1)
-==================
=====
+==================
v0.1, May 2005
NAME
v0.1, May 2005
NAME
@@
-9,11
+9,11
@@
git-diff-helper - Generates patch format output for git-diff-*
SYNOPSIS
--------
SYNOPSIS
--------
-'git-diff-helper' [-z] [-
R
]
+'git-diff-helper' [-z] [-
S<string>] [-O<orderfile>
]
DESCRIPTION
-----------
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
generates patch format output.
OPTIONS
@@
-21,23
+21,27
@@
OPTIONS
-z::
\0 line termination on input
-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<string>::
+ Look for differences that contains the change in <string>.
- git-diff-cache <tree> | 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 <string>.
-would show a diff to bring the working file back to what is in the <tree>.
+-O<orderfile>::
+ Output the patch in the order specified in the
+ <orderfile>, which has one shell glob pattern per line.
See Also
--------
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
------
Author
------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Junio C Hamano <junkio@cox.net>
+
Documentation
--------------
Documentation
--------------