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: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
68e37f8402
commit
16cc50d12e
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user