From: Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>
Date: Thu, 8 Dec 2005 23:28:05 +0000 (+0100)
Subject: Use uniform description for the '--' option.
X-Git-Tag: v0.99.9m^2~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16cc50d12e8852583bde5c1116e4075f79d0a403;p=git.git

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>
---

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429f..fbc986aa8 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.