summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-03 08:36:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-03 18:23:03 (GMT)
commitce24067549a8554b214e723d7aa4bc063c54409e (patch)
tree3dfaf2756f55a43a2e87092550cdc5dab4c82e9b /diff-files.c
parent355e76a4a3c5e49ae15a642806457bce10fe2ef4 (diff)
downloadgit-ce24067549a8554b214e723d7aa4bc063c54409e.zip
git-ce24067549a8554b214e723d7aa4bc063c54409e.tar.gz
git-ce24067549a8554b214e723d7aa4bc063c54409e.tar.bz2
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index 3b05497..a425112 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -7,7 +7,7 @@
#include "diff.h"
static const char *diff_files_usage =
-"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [paths...]";
+"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [paths...]";
static int diff_output_format = DIFF_FORMAT_HUMAN;
static int detect_rename = 0;