summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-08 23:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 23:50:13 (GMT)
commit16cc50d12e8852583bde5c1116e4075f79d0a403 (patch)
treeffe39c5df3e30917063e853b9538bf56ee676fe8
parent68e37f8402d5ad33b423686558265e55655a2db6 (diff)
downloadgit-16cc50d12e8852583bde5c1116e4075f79d0a403.zip
git-16cc50d12e8852583bde5c1116e4075f79d0a403.tar.gz
git-16cc50d12e8852583bde5c1116e4075f79d0a403.tar.bz2
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>
-rw-r--r--Documentation/git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 6030642..fbc986a 100644
--- 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 filenames.
+ Do not interpret any more arguments as options.
-a::
Run merge against all files in the index that need merging.