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 /Documentation/git-diff-files.txt | |
| 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 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 8439355b06..58137b3b9e 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -27,7 +27,8 @@ OPTIONS Remain silent even on nonexisting files -R:: - Output diff in reverse. + Swap two inputs; that is, show differences from on-disk files + to cache contents. -B:: Break complete rewrite changes into pairs of delete and create. |