Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
http-backend: Don't infinite loop during die()
[gitweb.git]
/
builtin-merge-base.c
diff --git
a/builtin-merge-base.c
b/builtin-merge-base.c
index a6ec2f7ab76db27afbb63aacf3bba60b4e73b3f6..54e7ec22370ce63150ddc93ebe252bea09f5064a 100644
(file)
--- a/
builtin-merge-base.c
+++ b/
builtin-merge-base.c
@@
-23,7
+23,7
@@
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
}
static const char * const merge_base_usage[] = {
- "git merge-base [-
-all] <commit-id> <commit-id
>...",
+ "git merge-base [-
a|--all] <commit> <commit
>...",
NULL
};