git-merge-index documentation: clarify synopsis
The options following <merge-program> are not -a, --, or <file>..., but either -a, or -- <file>..., while -- is optional. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Gerrit Pape committed
Feb 22, 2008 at 08:55 UTC
c7fae5fc68974eec9b60750424946a67cc143ad2
2 files changed
+2
-2
Documentation/git-merge-index.txt
+1
-1
@@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging
8
9
SYNOPSIS
10
--------
11
-'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
11
+'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*)
12
13
DESCRIPTION
14
-----------
merge-index.c
+1
-1
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
91
signal(SIGCHLD, SIG_DFL);
92
93
if (argc < 3)
94
- usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
94
+ usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
95
96
setup_git_directory();
97
read_cache();