aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-16 16:38:46 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-16 16:38:46 -0700
commit8de43386505b503e25788f75f89802495828e6c0 (patch)
tree9ab51250b2a9474c7ae872596ea118dddf327a91 /builtin
parentf7045912f85a1c67f3c997202020dfb26078e978 (diff)
parentded7e0491b78e3e8384bcd9f63918c52785c4cd6 (diff)
downloadgit-8de43386505b503e25788f75f89802495828e6c0.tar.gz
git-8de43386505b503e25788f75f89802495828e6c0.tar.xz
Merge branch 'vr/merge-base-doc' into maint
* vr/merge-base-doc: Restructure documentation for git-merge-base. Documentation: update to git-merge-base --octopus
Diffstat (limited to 'builtin')
-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 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
};