diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-03 01:36:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-03 11:23:03 -0700 |
| commit | ce24067549a8554b214e723d7aa4bc063c54409e (patch) | |
| tree | 3dfaf2756f55a43a2e87092550cdc5dab4c82e9b /diff-cache.c | |
| parent | 355e76a4a3c5e49ae15a642806457bce10fe2ef4 (diff) | |
| download | git-ce24067549a8554b214e723d7aa4bc063c54409e.tar.gz | |
[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-cache.c')
| -rw-r--r-- | diff-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c index 2aaf16a39d..8e5f72bf3f 100644 --- a/diff-cache.c +++ b/diff-cache.c @@ -157,7 +157,7 @@ static void mark_merge_entries(void) } static char *diff_cache_usage = -"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [--cached] <tree-ish> [<path>...]"; +"git-diff-cache [-p] [-r] [-z] [-m] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [--cached] <tree-ish> [<path>...]"; int main(int argc, const char **argv) { |