In DESCRIPTION, the '<commit>..<commit>' form refers to "the previous
form", namely the '<commit> <commit>' form. However, bd52900
(Documentation: Describe "git diff <blob> <blob>" separately,
2012-12-18) broke this by inserting a form in between these two forms.
Fix this by reordering a form.
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
Documentation/git-diff.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index a7b4620..8623867 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -11,8 +11,8 @@ SYNOPSIS
[verse]
'git diff' [options] [<commit>] [--] [<path>...]
'git diff' [options] --cached [<commit>] [--] [<path>...]
-'git diff' [options] <commit> <commit> [--] [<path>...]
'git diff' [options] <blob> <blob>
+'git diff' [options] <commit> <commit> [--] [<path>...]
'git diff' [options] [--no-index] [--] <path> <path>
DESCRIPTION
@@ -51,16 +51,16 @@ directories. This behavior can be forced by --no-index.
branch name to compare with the tip of a different
branch.
-'git diff' [--options] <commit> <commit> [--] [<path>...]::
-
- This is to view the changes between two arbitrary
- <commit>.
-
'git diff' [options] <blob> <blob>::
This form is to view the differences between the raw
contents of two blob objects.
+'git diff' [--options] <commit> <commit> [--] [<path>...]::
+
+ 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
--
1.8.2.1.502.g2d60b5c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
