diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:37 -0700 |
| commit | 014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9 (patch) | |
| tree | 4bdacdfa27f5f3e8027680dcbbbed2fd3a2b429d /builtin | |
| parent | Merge branch 'ss/cherry-pick-x-doc' (diff) | |
| parent | Restructure documentation for git-merge-base. (diff) | |
| download | tgif-014d298b1d6c7a493e7a4339e8327ae1c8e1d8d9.tar.xz | |
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 96dd160731..4f30f1b0c8 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 }; |