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>
This commit is contained in:
Michael J Gruber
2009-08-05 09:59:19 +02:00
committed by Junio C Hamano
parent 30ca4ca7b2
commit 995bdc73fe
4 changed files with 9 additions and 7 deletions

View File

@ -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
};