diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-10 08:52:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 08:52:06 -0800 |
| commit | ed7e9ed5cdad5c3a5b947619a34154f5a0ebc020 (patch) | |
| tree | e717c3da6d71b5ed6615333b6922c3b0b8c2ec31 /builtin-reset.c | |
| parent | 83b10ca25fd49d25561fd6344bd8e40b8987f50a (diff) | |
| parent | 5d2dcc423ec689ff4a6bcb83b00d5b43657b0c88 (diff) | |
| download | git-ed7e9ed5cdad5c3a5b947619a34154f5a0ebc020.tar.gz git-ed7e9ed5cdad5c3a5b947619a34154f5a0ebc020.tar.xz | |
Merge branch 'fc/opt-quiet-gc-reset'
* fc/opt-quiet-gc-reset:
General --quiet improvements
Diffstat (limited to 'builtin-reset.c')
| -rw-r--r-- | builtin-reset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-reset.c b/builtin-reset.c index 11d1c6e4d..31babd0b9 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -202,6 +202,7 @@ 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), OPT_SET_INT(0, "mixed", &reset_type, "reset HEAD and index", MIXED), OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT), @@ -209,8 +210,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix) "reset HEAD, index and working tree", HARD), OPT_SET_INT(0, "merge", &reset_type, "reset HEAD, index and working tree", MERGE), - OPT_BOOLEAN('q', NULL, &quiet, - "disable showing new HEAD in hard reset and progress message"), OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"), OPT_END() }; |