[PATCH] reset: update help text
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:50:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
State --mixed is the default so users don't have to open up man page. Also make it clear how --hard and --merge are different. Move -q to bottom because it's not that important to pay attention to as the first item. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/reset.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index eb5f98c..7419c9e 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c@@ -243,17 +243,17 @@ int cmd_reset(int argc, const char **argv, const char *prefix) struct commit *commit; char *reflog_action, msg[1024]; const struct option options[] = { - OPT__QUIET(&quiet, "be quiet, only report errors"), OPT_SET_INT(0, "mixed", &reset_type, - "reset HEAD and index", MIXED), + "reset HEAD and index (default)", MIXED), OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT), OPT_SET_INT(0, "hard", &reset_type, "reset HEAD, index and working tree", HARD), OPT_SET_INT(0, "merge", &reset_type, - "reset HEAD, index and working tree", MERGE), + "like --hard but keep local changes in working tree", MERGE), OPT_SET_INT(0, "keep", &reset_type, "reset HEAD but keep local changes", KEEP), OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"), + OPT__QUIET(&quiet, "be quiet, only report errors"), OPT_END() };
--
1.7.4.74.g639db