Browse Source

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>
maint
Gerrit Pape 17 years ago committed by Junio C Hamano
parent
commit
c7fae5fc68
  1. 2
      Documentation/git-merge-index.txt
  2. 2
      merge-index.c

2
Documentation/git-merge-index.txt

@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging @@ -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
-----------

2
merge-index.c

@ -91,7 +91,7 @@ int main(int argc, char **argv) @@ -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();

Loading…
Cancel
Save