diff options
| author | Gerrit Pape <pape@smarden.org> | 2008-02-22 08:55:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-22 07:02:40 -0800 |
| commit | c7fae5fc68974eec9b60750424946a67cc143ad2 (patch) | |
| tree | 8a6f4aaaed25c839a11a84b747679b6394cd7af5 /merge-index.c | |
| parent | 0fb7fc751d29cd1099556f71fc7c08158a6a78bc (diff) | |
| download | git-c7fae5fc68974eec9b60750424946a67cc143ad2.tar.gz | |
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>
Diffstat (limited to 'merge-index.c')
| -rw-r--r-- | merge-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c index bbb700b54e..7491c56ad2 100644 --- a/merge-index.c +++ b/merge-index.c @@ -91,7 +91,7 @@ int main(int argc, char **argv) signal(SIGCHLD, SIG_DFL); if (argc < 3) - usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)"); + usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)"); setup_git_directory(); read_cache(); |