switch: add short option for --detach

pclouds · gitster · commit 163e3b2975cf · 2019-04-02T13:57:00.000+09:00
"git checkout" automatically detaches branches and --detach is not
that useful (--no-detach is more likely). But for "switch", you
may want to use it more often once you're used to detached HEAD. This
of course adds -d to git-checkout but it does not harm (yet?) to do it.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -1423,7 +1423,7 @@ static struct option *add_common_switch_branch_options(
 	struct checkout_opts *opts, struct option *prevopts)
 {
 	struct option options[] = {
-		OPT_BOOL(0, "detach", &opts->force_detach, N_("detach HEAD at named commit")),
+		OPT_BOOL('d', "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_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),

Original file line number	Diff line number	Diff line change
`@@ -1423,7 +1423,7 @@ static struct option *add_common_switch_branch_options(`
`1423`	`1423`	`struct checkout_opts opts, struct option prevopts)`
`1424`	`1424`	`{`
`1425`	`1425`	`struct option options[] = {`
`1426`		`- OPT_BOOL(0, "detach", &opts->force_detach, N_("detach HEAD at named commit")),`
	`1426`	`+ OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),`
`1427`	`1427`	`OPT_SET_INT('t', "track", &opts->track, N_("set upstream info for new branch"),`
`1428`	`1428`	`BRANCH_TRACK_EXPLICIT),`
`1429`	`1429`	`OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),`