git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
68e37f8
)
Use uniform description for the '--' option.
author
Nikolai Weibull
<redacted>
Thu, 8 Dec 2005 23:28:05 +0000
(
00:28
+0100)
committer
Junio C Hamano
<redacted>
Thu, 8 Dec 2005 23:50:13 +0000
(15:50 -0800)
All descriptions of the '--' option were the same except for that in
Documentation/git-merge-index.txt.
Signed-off-by: Nikolai Weibull <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-merge-index.txt
patch
|
blob
|
history
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 60306429fb7cad45e063cef8f70fc79005df7f70..fbc986aa84d180d304a35a94dcd1f80e6a848b80 100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-20,7
+20,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
--::
-
Interpret all following arguments as filename
s.
+
Do not interpret any more arguments as option
s.
-a::
Run merge against all files in the index that need merging.
git clone https://git.99rst.org/PROJECT