[PATCH] git-index-merge: clarify synopsis
From: Gerrit Pape <hidden>
Date: 2016-06-15 22:44:15
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The options following <merge-program> are not -a, --, or <file>..., but either -a, or -- <file>..., while -- is optional. Signed-off-by: Gerrit Pape <redacted> --- Documentation/git-merge-index.txt | 2 +- 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 5d816d0..19ee017 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 bbb700b..7491c56 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();
--
1.5.4.2