path: root/Documentation
diff options
authorJunio C Hamano <>2005-06-03 08:36:43 (GMT)
committerLinus Torvalds <>2005-06-03 18:23:03 (GMT)
commitce24067549a8554b214e723d7aa4bc063c54409e (patch)
tree3dfaf2756f55a43a2e87092550cdc5dab4c82e9b /Documentation
parent355e76a4a3c5e49ae15a642806457bce10fe2ef4 (diff)
[PATCH] diff: Fix docs and add -O to diff-helper.
This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'Documentation')
4 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/git-diff-cache.txt b/Documentation/git-diff-cache.txt
index 9c7832f..14041f3 100644
--- a/Documentation/git-diff-cache.txt
+++ b/Documentation/git-diff-cache.txt
@@ -57,7 +57,8 @@ OPTIONS
<orderfile>, which has one shell glob pattern per line.
- Output diff in reverse.
+ Swap two inputs; that is, show differences from cache or
+ on-disk file to tree contents.
do not consider the on-disk file at all
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 8439355..58137b3 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -27,7 +27,8 @@ OPTIONS
Remain silent even on nonexisting files
- Output diff in reverse.
+ Swap two inputs; that is, show differences from on-disk files
+ to cache contents.
Break complete rewrite changes into pairs of delete and create.
diff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt
index 90342c9..29c5967 100644
--- a/Documentation/git-diff-helper.txt
+++ b/Documentation/git-diff-helper.txt
@@ -9,7 +9,7 @@ git-diff-helper - Generates patch format output for git-diff-*
-'git-diff-helper' [-z] [-S<string>]
+'git-diff-helper' [-z] [-S<string>] [-O<orderfile>]
@@ -24,6 +24,9 @@ OPTIONS
Look for differences that contains the change in <string>.
+ Output the patch in the order specified in the
+ <orderfile>, which has one shell glob pattern per line.
See Also
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 9e03885..762546b 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -43,7 +43,7 @@ OPTIONS
Detect copies as well as renames.
- Output diff in reverse.
+ Swap two input trees.
Look for differences that contains the change in <string>.