diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-13 12:52:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 13:09:17 -0700 |
| commit | dda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch) | |
| tree | 0252e50a800caa678f835ee26193e5f728459f0a /Documentation/git-diff-stages.txt | |
| parent | 52f28529f4f90cebdca47f8eacbff5cb20004bed (diff) | |
| download | git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.gz git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.xz | |
[PATCH] Clean up diff option descriptions.
I got tired of maintaining almost duplicated descriptions in
diff-* brothers, both in usage string and documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-diff-stages.txt')
| -rw-r--r-- | Documentation/git-diff-stages.txt | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt index e7e59c849..2084c7041 100644 --- a/Documentation/git-diff-stages.txt +++ b/Documentation/git-diff-stages.txt @@ -9,7 +9,7 @@ git-diff-stages - Compares content and mode of blobs between stages in an unmerg SYNOPSIS -------- -'git-diff-stages' [-p] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <stage1> <stage2> [<path>...] +'git-diff-stages' [<common diff options>] <stage1> <stage2> [<path>...] DESCRIPTION ----------- @@ -18,53 +18,11 @@ unmerged index file. OPTIONS ------- +include::diff-options.txt[] + <stage1>,<stage2>:: The stage number to be compared. --p:: - Generate patch (see section on generating patches) - --r:: - This flag does not mean anything. It is there only to match - "git-diff-tree". Unlike "git-diff-tree", "git-diff-stages" - always looks at all the subdirectories. - --z:: - \0 line termination on output - --B:: - Break complete rewrite changes into pairs of delete and create. - --M:: - Detect renames. - --C:: - Detect copies as well as renames. - ---find-copies-harder:: - By default, -C option finds copies only if the original - file of the copy was modified in the same changeset for - performance reasons. This flag makes the command - inspect unmodified files as candidates for the source of - copy. This is a very expensive operation for large - projects, so use it with caution. - --S<string>:: - Look for differences that contains the change in <string>. - ---pickaxe-all:: - When -S finds a change, show all the changes in that - changeset, not just the files that contains the change - in <string>. - --O<orderfile>:: - Output the patch in the order specified in the - <orderfile>, which has one shell glob pattern per line. - --R:: - Swap two inputs; that is, show differences from <stage2> to - <stage1>. - Output format ------------- include::diff-format.txt[] |