switch: remove -l

This option is ancient. Nowadays reflog is enabled by default and
automatically created for new branches. Keep it in git-checkout only.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6d0b2ef5654432c501e1511dd24bec0d524e7e2d..d63116b68689d84d12516b0e34914c77ad803aa6 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1376,7 +1376,6 @@ static struct option *add_common_switch_branch_options(
        struct checkout_opts *opts, struct option *prevopts)
 {
        struct option options[] = {
        struct checkout_opts *opts, struct option *prevopts)
 {
        struct option options[] = {

-               OPT_BOOL('l', NULL, &opts->new_branch_log, N_("create reflog for new branch")),

                OPT_BOOL(0, "detach", &opts->force_detach, N_("detach HEAD at named commit")),
                OPT_SET_INT('t', "track",  &opts->track, N_("set upstream info for new branch"),
                        BRANCH_TRACK_EXPLICIT),
                OPT_BOOL(0, "detach", &opts->force_detach, N_("detach HEAD at named commit")),
                OPT_SET_INT('t', "track",  &opts->track, N_("set upstream info for new branch"),
                        BRANCH_TRACK_EXPLICIT),


@@ -1579,6 +1578,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                           N_("create and checkout a new branch")),
                OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
                           N_("create/reset and checkout a branch")),
                           N_("create and checkout a new branch")),
                OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"),
                           N_("create/reset and checkout a branch")),

+               OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")),

                OPT_END()
        };
        int ret;
                OPT_END()
        };
        int ret;