path: root/Documentation/git-diff-stages.txt
diff options
Diffstat (limited to 'Documentation/git-diff-stages.txt')
1 files changed, 3 insertions, 45 deletions
diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index e7e59c8..2084c70 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
-'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>...]
@@ -18,53 +18,11 @@ unmerged index file.
The stage number to be compared.
- Generate patch (see section on generating patches)
- 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.
- \0 line termination on output
- Break complete rewrite changes into pairs of delete and create.
- Detect renames.
- Detect copies as well as renames.
- 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.
- Look for differences that contains the change in <string>.
- When -S finds a change, show all the changes in that
- changeset, not just the files that contains the change
- in <string>.
- Output the patch in the order specified in the
- <orderfile>, which has one shell glob pattern per line.
- Swap two inputs; that is, show differences from <stage2> to
- <stage1>.
Output format