summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorVincent van Ravesteijn <vfr@lyx.org>2011-04-15 08:34:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-15 17:13:52 (GMT)
commit5729482429725c4688c678701ca5197eaf367a07 (patch)
tree391dfe32a96dcfce90e12e337ee9b11928e46a67 /builtin/merge-base.c
parent810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff)
downloadgit-5729482429725c4688c678701ca5197eaf367a07.zip
git-5729482429725c4688c678701ca5197eaf367a07.tar.gz
git-5729482429725c4688c678701ca5197eaf367a07.tar.bz2
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 <vfr@lyx.org> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-base.c')
-rw-r--r--builtin/merge-base.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 96dd160..4f30f1b 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
};