summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Jean-Noël Avila <jn.avila@free.fr>2021-11-06 19:48:54 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-09 09:39:11 -0800
commita443b762cf2441b631b177e702b405036f8ddc7d (patch)
tree3133952f642ff411d214180877d342cd0ec2abc6 /Documentation/git-merge-index.txt
parentdoc: git-ls-files: express options as optional alternatives (diff)
downloadtgif-a443b762cf2441b631b177e702b405036f8ddc7d.tar.xz
doc: use three dots for indicating repetition instead of star
This is how it is specified in CodingGuidelines. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 2ab84a91e5..eea56b3154 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
-----------