diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2009-08-05 09:59:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 10:28:05 -0700 |
| commit | 995bdc73fe0e28d622af0897440f0ea298345585 (patch) | |
| tree | b63d21fb26cd87f2b2ea741898df76007d96ae42 /builtin-merge-base.c | |
| parent | 30ca4ca7b25082574d93b3a6d46a966d39de0488 (diff) | |
| download | git-995bdc73fe0e28d622af0897440f0ea298345585.tar.gz | |
git-merge-base/git-show-branch: Cleanup documentation and usage
Make sure that usage strings and documentation coincide with each other
and with the actual code.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-base.c')
| -rw-r--r-- | builtin-merge-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-base.c b/builtin-merge-base.c index a6ec2f7ab7..54e7ec2237 100644 --- a/builtin-merge-base.c +++ b/builtin-merge-base.c @@ -23,7 +23,7 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all) } static const char * const merge_base_usage[] = { - "git merge-base [--all] <commit-id> <commit-id>...", + "git merge-base [-a|--all] <commit> <commit>...", NULL }; |