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>

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index a11f8c6e4bb04a25a8763ba9930ab86079a1f14c..6f3941f2a49ce51ee295158a4d78f5c80c1afeb7 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -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
 };