| Message ID | patch-v10-01.12-9240ab10649-20221215T084803Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | merge-index: prepare to rewrite merge drivers in C | expand |
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index eea56b3154e..a297105d6d8 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -9,7 +9,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- [verse] -'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) ) +'git merge-index' [-o] [-q] <merge-program> (-a | ([--] <file>...)) DESCRIPTION ----------- diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 452f833ac46..69b18ed82ac 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -80,7 +80,7 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix) 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 | ([--] <file>...))"); repo_read_index(the_repository); diff --git a/t/t0450/txt-help-mismatches b/t/t0450/txt-help-mismatches index a0777acd667..9e73c1892ae 100644 --- a/t/t0450/txt-help-mismatches +++ b/t/t0450/txt-help-mismatches @@ -34,7 +34,6 @@ mailsplit maintenance merge merge-file -merge-index merge-one-file multi-pack-index name-rev
Make the "merge-index" doc SYNOPSIS and "-h" output consistent with one another, and small issues with it: - Whitespace padding, per e2f4e7e8c0f (doc txt & -h consistency: correct padding around "[]()", 2022-10-13). - Use "<file>" consistently, rather than using "<filename>" in the "-h" output, and "<file>" in the SYNOPSIS. - The "-h" version incorrectly claimed that the filename was optional, but it's not. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Documentation/git-merge-index.txt | 2 +- builtin/merge-index.c | 2 +- t/t0450/txt-help-mismatches | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)