Improvements to `git checkout -h`
be a little more verbose about what each option does Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Daniel Knittl-Frank committed
Sep 24, 2010 at 18:21 UTC
3695dc0af1bb5871430c028222d1af0a86720e62
1 file changed
+6
-6
builtin/checkout.c
+6
-6
@@ -691,16 +691,16 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
691
"create and checkout a new branch"),
692
OPT_STRING('B', NULL, &opts.new_branch_force, "branch",
693
"create/reset and checkout a branch"),
694
- OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"),
695
- OPT_SET_INT('t', "track", &opts.track, "track",
694
+ OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "create reflog for new branch"),
695
+ OPT_SET_INT('t', "track", &opts.track, "set upstream info for new branch",
696
BRANCH_TRACK_EXPLICIT),
697
OPT_STRING(0, "orphan", &opts.new_orphan_branch, "new branch", "new unparented branch"),
698
- OPT_SET_INT('2', "ours", &opts.writeout_stage, "stage",
698
+ OPT_SET_INT('2', "ours", &opts.writeout_stage, "checkout our version for unmerged files",
699
2),
700
- OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage",
700
+ OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout their version for unmerged files",
701
3),
702
- OPT_BOOLEAN('f', "force", &opts.force, "force"),
703
- OPT_BOOLEAN('m', "merge", &opts.merge, "merge"),
702
+ OPT_BOOLEAN('f', "force", &opts.force, "force checkout (throw away local modifications)"),
703
+ OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge with the new branch"),
704
OPT_STRING(0, "conflict", &conflict_style, "style",
705
"conflict style (merge or diff3)"),
706
OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"),