mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git-diff documentation use [--] when it should.

Browse Source 
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>
This commit is contained in:
Brian Gernhardt
2006-12-15 07:39:33 -05:00
committed by Junio C Hamano
parent 89c4afe0d0
commit e697e4cd1f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-diff.txt
View File

@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
SYNOPSIS SYNOPSIS
-------- --------
'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...] 'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree.
would want comparison with the latest commit, so if you would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD. do not give <commit>, it defaults to HEAD.
'git-diff' [--options] <commit> -- [<path>...]:: 'git-diff' [--options] <commit> [--] [<path>...]::
This form is to view the changes you have in your This form is to view the changes you have in your
working tree relative to the named <commit>. You can 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.
branch name to compare with the tip of a different branch name to compare with the tip of a different
branch. branch.
'git-diff' [--options] <commit> <commit> -- [<path>...]:: 'git-diff' [--options] <commit> <commit> [--] [<path>...]::
This form is to view the changes between two <commit>, This form is to view the changes between two <commit>,
for example, tips of two branches. for example, tips of two branches.