Merge branch 'kk/maint-prefix-in-config-mak' into maint

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 96dd160731ce29b18be646893057929bab97cb8a..4f30f1b0c8b14e78e272ec54a86584d66501f754 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -23,7 +23,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
 }
 
 static const char * const merge_base_usage[] = {
-       "git merge-base [-a|--all] [--octopus] <commit> <commit>...",
+       "git merge-base [-a|--all] <commit> <commit>...",
+       "git merge-base [-a|--all] --octopus <commit>...",
        "git merge-base --independent <commit>...",
        NULL
 };