Make git-diff documentation use [--] when it should.
Two of the cases has "[--] [<path>...]" and two had "-- [<path>...]". Not terribly consistent and potentially confusing. Also add "[--]" to the synopsis so that it's obvious you can use it from the very beginning. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Brian Gernhardt committed
Dec 15, 2006 at 07:39 UTC
e697e4cd1fc492e312a396211bafc629d6297ebd
1 file changed
+3
-3
Documentation/git-diff.txt
+3
-3
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
8
9
SYNOPSIS
10
--------
11
-'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
11
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]
12
13
DESCRIPTION
14
-----------
@@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree.
30
would want comparison with the latest commit, so if you
31
do not give <commit>, it defaults to HEAD.
32
33
-'git-diff' [--options] <commit> -- [<path>...]::
33
+'git-diff' [--options] <commit> [--] [<path>...]::
34
35
This form is to view the changes you have in your
36
working tree relative to the named <commit>. You can
@@ -38,7 +38,7 @@ tree and the index file, or the index file and the working tree.
38
branch name to compare with the tip of a different
39
branch.
40
41
-'git-diff' [--options] <commit> <commit> -- [<path>...]::
41
+'git-diff' [--options] <commit> <commit> [--] [<path>...]::
42
43
This form is to view the changes between two <commit>,
44
for example, tips of two branches.