From 5729482429725c4688c678701ca5197eaf367a07 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Fri, 15 Apr 2011 10:34:03 +0200 Subject: Documentation: update to git-merge-base --octopus Unlike plain merge-base, merge-base --octopus only requires at least one commit argument; update the synopsis to reflect that. Add a sentence to the discussion that when --octopus is used, we do expect '2' (the common ansestor across all) as the result. Signed-off-by: Vincent van Ravesteijn Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- builtin/merge-base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'builtin') 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] ...", + "git merge-base [-a|--all] ...", + "git merge-base [-a|--all] --octopus ...", "git merge-base --independent ...", NULL }; -- cgit v1.2.1