From 16cc50d12e8852583bde5c1116e4075f79d0a403 Mon Sep 17 00:00:00 2001 From: Nikolai Weibull Date: Fri, 9 Dec 2005 00:28:05 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-merge-index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 60306429..fbc986aa 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. -- 2.11.0