Merge branch 'nb/branch-show-other-worktrees-head'

diff --git a/builtin/branch.c b/builtin/branch.c
index 3d1872babc826a611f4eeb71c36fb0dcc67bec85..2cb45e42e1967f365a6df14f42e2553290ffce85 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -652,8 +652,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                OPT_MERGED(&filter, N_("print only branches that are merged")),
                OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
                OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
-               OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
-                            N_("field name to sort on"), &parse_opt_ref_sorting),
+               OPT_REF_SORT(sorting_tail),
                {
                        OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
                        N_("print only branches of the object"), 0, parse_opt_object_name