From 8f5f2f646a07772df12c3f7bf17eb62541042e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Thu, 13 Oct 2022 17:39:12 +0200 Subject: [PATCH] doc txt & -h consistency: make output order consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix cases where the SYNOPSIS and -h output was presented in a different order. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- 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 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] ..."), 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 };