[PATCH v3 20/36] doc txt & -h consistency: make output order consistent
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 30, 2022, 18:07 UTC
- Message-ID
- <patch-v3-20.36-98bdd0353cf-20220930T180415Z-avarab@gmail.com>
- In-Reply-To
- <cover-v3-00.36-00000000000-20220930T180414Z-avarab@gmail.com>
Fix cases where the SYNOPSIS and -h output was presented in a different order.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- 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] <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 };
-- 2.38.0.rc2.935.g6b421ae1592