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 | |
| parent | send-email: fix In-Reply-To regression (diff) | |
| download | tgif-c7fae5fc68974eec9b60750424946a67cc143ad2.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-merge-index.txt | 2 | ||||
| -rw-r--r-- | merge-index.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 5d816d0d8b..19ee017aed 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- -'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*) +'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*) DESCRIPTION ----------- 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(); |