Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / Documentation / git-diff.txt

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 1018110ddc2e21d2a458da6d97f9ff1f519d15b6..727f24d16ec931e4bb23f33f4f44f5c341e497f0 100644 (file)
--- 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