Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mg/log-decorate-HEAD'
[gitweb.git]
/
builtin
/
merge-index.c
diff --git
a/builtin/merge-index.c
b/builtin/merge-index.c
index b416d928492c43e78dc7ac0b3bd1d7a99abfe78b..1a1eafa6fdc2e9dc66c98d3a81b7ee50e44727da 100644
(file)
--- 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();