X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin%2Fmerge-index.c;h=1a1eafa6fdc2e9dc66c98d3a81b7ee50e44727da;hb=9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b;hp=b416d928492c43e78dc7ac0b3bd1d7a99abfe78b;hpb=59f3e3f1e2b600f122e011b3d90309736799e25d;p=thirdparty%2Fgit.git

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index b416d92849..1a1eafa6fd 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -75,7 +75,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 | [--] [<filename>...])");
 
 	read_cache();