X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=7491c56ad25332fb4aae6a075bf0577a1d800c3b;hb=1fb328947c8e3ace9df7d2d5374e26e2510a4e93;hp=bbb700b54eab2a14f60e090231a196874ff3a9e0;hpb=413b90f0da613b4edeb6259e04c7dc36b703bc3b;p=git.git

diff --git a/merge-index.c b/merge-index.c
index bbb700b54..7491c56ad 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
 	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>*)");
 
 	setup_git_directory();
 	read_cache();