{"thread":{"id":"12256","subject":"[PATCH] git-index-merge: clarify synopsis","startedAt":"2008-02-22T08:55:29Z","lastAt":"2008-02-22T08:55:29Z","messageCount":1,"participants":["Gerrit Pape"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"69561","messageId":"20080222085530.20537.qmail@d4fd609604fc20.315fe32.mid.smarden.org","threadId":"12256","inReplyTo":null,"subject":"[PATCH] git-index-merge: clarify synopsis","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2008-02-22T08:55:29Z","receivedAt":"2008-02-22T08:55:29Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"The options following <merge-program> are not -a, --, or <file>...,\nbut either -a, or -- <file>..., while -- is optional.\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n Documentation/git-merge-index.txt |    2 +-\n merge-index.c                     |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt\nindex 5d816d0..19ee017 100644\n--- a/Documentation/git-merge-index.txt\n+++ b/Documentation/git-merge-index.txt\n@@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging\n \n SYNOPSIS\n --------\n-'git-merge-index' [-o] [-q] <merge-program> (-a | \\-- | <file>\\*)\n+'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\\*)\n \n DESCRIPTION\n -----------\ndiff --git a/merge-index.c b/merge-index.c\nindex bbb700b..7491c56 100644\n--- a/merge-index.c\n+++ b/merge-index.c\n@@ -91,7 +91,7 @@ int main(int argc, char **argv)\n \tsignal(SIGCHLD, SIG_DFL);\n \n \tif (argc < 3)\n-\t\tusage(\"git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)\");\n+\t\tusage(\"git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)\");\n \n \tsetup_git_directory();\n \tread_cache();\n-- \n1.5.4.2\n"}]}