提交 16cc50d1 编写于 作者: N Nikolai Weibull 提交者: Junio C Hamano

Use uniform description for the '--' option.

All descriptions of the '--' option were the same except for that in
Documentation/git-merge-index.txt.
Signed-off-by: NNikolai Weibull <nikolai@bitwi.se>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 68e37f84
......@@ -20,7 +20,7 @@ files are passed as arguments 5, 6 and 7.
OPTIONS
-------
--::
Interpret all following arguments as filenames.
Do not interpret any more arguments as options.
-a::
Run merge against all files in the index that need merging.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册