X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-base.c;h=4f30f1b0c8b14e78e272ec54a86584d66501f754;hb=cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b;hp=96dd160731ce29b18be646893057929bab97cb8a;hpb=006f424b2d014b8a7c4887b7ddbb57256dd6b8c7;p=git.git

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 96dd16073..4f30f1b0c 100644
--- 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
 };