diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 22:51:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 22:51:37 (GMT) |
| commit | 014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9 (patch) | |
| tree | 4bdacdfa27f5f3e8027680dcbbbed2fd3a2b429d /builtin | |
| parent | 3340f60483e4ccb74db5d0eb453396322c2962aa (diff) | |
| parent | ded7e0491b78e3e8384bcd9f63918c52785c4cd6 (diff) | |
| download | git-014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9.zip git-014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9.tar.gz git-014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9.tar.bz2 | |
Merge branch 'vr/merge-base-doc'
* 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.c | 3 |
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 }; |