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>
Ævar Arnfjörð Bjarmason committed
Oct 13, 2022 at 17:39 UTC
8f5f2f646a07772df12c3f7bf17eb62541042e41
1 file changed
+1
-1
builtin/merge-base.c
+1
-1
@@ -31,8 +31,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
31
static const char * const merge_base_usage[] = {
32
N_("git merge-base [-a | --all] <commit> <commit>..."),
33
N_("git merge-base [-a | --all] --octopus <commit>..."),
34
- N_("git merge-base --independent <commit>..."),
34
N_("git merge-base --is-ancestor <commit> <commit>"),
35
+ N_("git merge-base --independent <commit>..."),
36
N_("git merge-base --fork-point <ref> [<commit>]"),
37
NULL
38
};