summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-15 23:29:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-15 23:29:44 (GMT)
commit1863dbdde9dfcea3c51940cc106b699dedbebff8 (patch)
tree045f5411d2fa96f810aa11e1c4f93176644a4142
parent12f5eb9f082d7f4cb083a11aa59ac8bbd5e1589a (diff)
parent78b76d310f3e9c0cc1e990ed93f58711e48d9ab2 (diff)
downloadgit-1863dbdde9dfcea3c51940cc106b699dedbebff8.zip
git-1863dbdde9dfcea3c51940cc106b699dedbebff8.tar.gz
git-1863dbdde9dfcea3c51940cc106b699dedbebff8.tar.bz2
Merge branch 'ct/diff-with-merge-base-clarification' into master
Doc update. * ct/diff-with-merge-base-clarification: git-diff.txt: reorder possible usages git-diff.txt: don't mark required argument as optional
-rw-r--r--Documentation/git-diff.txt15
1 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 1018110..727f24d 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -63,13 +63,7 @@ files on disk.
This is to view the changes between two arbitrary
<commit>.
-'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
-
- This is synonymous to the previous form. If <commit> on
- one side is omitted, it will have the same effect as
- using HEAD instead.
-
-'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]::
+'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]::
This form is to view the results of a merge commit. The first
listed <commit> must be the merge itself; the remaining two or
@@ -78,6 +72,13 @@ files on disk.
For instance, if `master` names a merge commit, `git diff master
master^@` gives the same combined diff as `git show master`.
+'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
+
+ This is synonymous to the earlier form (without the "..") for
+ viewing the changes between two arbitrary <commit>. If <commit> on
+ one side is omitted, it will have the same effect as
+ using HEAD instead.
+
'git diff' [<options>] <commit>\...<commit> [--] [<path>...]::
This form is to view the changes on the branch containing