doc txt & -h consistency: make output order consistent
Fix cases where the SYNOPSIS and -h output was presented in a different order. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c08cfc395f
commit
8f5f2f646a
@ -31,8 +31,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
|
||||
static const char * const merge_base_usage[] = {
|
||||
N_("git merge-base [-a | --all] <commit> <commit>..."),
|
||||
N_("git merge-base [-a | --all] --octopus <commit>..."),
|
||||
N_("git merge-base --independent <commit>..."),
|
||||
N_("git merge-base --is-ancestor <commit> <commit>"),
|
||||
N_("git merge-base --independent <commit>..."),
|
||||
N_("git merge-base --fork-point <ref> [<commit>]"),
|
||||
NULL
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user