mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge-index documentation: clarify synopsis

Browse Source 
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>
This commit is contained in:
Gerrit Pape
2008-02-22 08:55:29 +00:00
committed by Junio C Hamano
parent 0fb7fc751d
commit c7fae5fc68
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge-index.txt
View File

@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging
SYNOPSIS SYNOPSIS
-------- --------
'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*) 'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*)
DESCRIPTION DESCRIPTION
----------- -----------

2
merge-index.c
View File

@ -91,7 +91,7 @@ int main(int argc, char **argv)
signal(SIGCHLD, SIG_DFL); signal(SIGCHLD, SIG_DFL);
if (argc < 3) 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(); setup_git_directory();
read_cache(); read_cache();