From: Ævar Arnfjörð Bjarmason Date: Fri, 30 Sep 2022 18:07:43 GMT Subject: [PATCH v3 20/36] doc txt & -h consistency: make output order consistent Message-ID: In-Reply-To: Fix cases where the SYNOPSIS and -h output was presented in a different order. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/merge-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index a11f8c6e4bb..6f3941f2a49 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] ..."), N_("git merge-base [-a | --all] --octopus ..."), - N_("git merge-base --independent ..."), N_("git merge-base --is-ancestor "), + N_("git merge-base --independent ..."), N_("git merge-base --fork-point []"), NULL }; -- 2.38.0.rc2.935.g6b421ae1592