diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index c613e71ca4..727f24d16e 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -63,12 +63,6 @@ files on disk. This is to view the changes between two arbitrary . -'git diff' [] .. [--] [...]:: - - This is synonymous to the previous form. If on - one side is omitted, it will have the same effect as - using HEAD instead. - 'git diff' [] ... [--] [...]:: This form is to view the results of a merge commit. The first @@ -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' [] .. [--] [...]:: + + This is synonymous to the earlier form (without the "..") for + viewing the changes between two arbitrary . If on + one side is omitted, it will have the same effect as + using HEAD instead. + 'git diff' [] \... [--] [...]:: This form is to view the changes on the branch containing