From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 13 Oct 2022 15:39:12 +0000 (+0200)
Subject: doc txt & -h consistency: make output order consistent
X-Git-Tag: v2.39.0-rc0~73^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f5f2f646a07772df12c3f7bf17eb62541042e41;p=thirdparty%2Fgit.git

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 a11f8c6e4b..6f3941f2a4 100644
--- 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
 };