X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-base.c;h=54e7ec22370ce63150ddc93ebe252bea09f5064a;hb=812d2a3d61b1bbb1931aff2ed6d2a17e939f5bf2;hp=03fc1c211453f1ed09ee2c6b71d438b0bfbf474f;hpb=799fdb4ed0f9443122fdb85f6f73c58cb1de12ec;p=git.git

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index 03fc1c211..54e7ec223 100644
--- 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
 };
 
@@ -53,7 +53,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
 	};
 
 	git_config(git_default_config, NULL);
-	argc = parse_options(argc, argv, options, merge_base_usage, 0);
+	argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
 	if (argc < 2)
 		usage_with_options(merge_base_usage, options);
 	rev = xmalloc(argc * sizeof(*rev));