提交 e697e4cd 编写于 作者: B Brian Gernhardt 提交者: Junio C Hamano

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: NBrian Gernhardt <benji@silverinsanity.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 89c4afe0
...@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc ...@@ -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. ...@@ -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. ...@@ -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.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册