summaryrefslogtreecommitdiffstats
path: root/git-merge-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-12-10 14:53:38 -0800
committerJunio C Hamano <gitster@pobox.com>2021-12-10 14:53:38 -0800
commit59a32b07d3e226cad19135aee37bf81c8849efc8 (patch)
tree36b60b52ab5a116eed5ea4723dfa5559da7981a2 /git-merge-index.txt
parentf24d6b5b23d901f1da0026ce4b3f9c1e1b5e09f6 (diff)
downloadgit-htmldocs-59a32b07d3e226cad19135aee37bf81c8849efc8.tar.gz
Autogenerated HTML docs for v2.34.1-182-ge7735
Diffstat (limited to 'git-merge-index.txt')
-rw-r--r--git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-index.txt b/git-merge-index.txt
index 2ab84a91e..eea56b315 100644
--- a/git-merge-index.txt
+++ b/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
-----------