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 | |
| parent | Merge branch 'maint' (diff) | |
| parent | General --quiet improvements (diff) | |
| download | tgif-ed7e9ed5cdad5c3a5b947619a34154f5a0ebc020.tar.xz | |
Merge branch 'fc/opt-quiet-gc-reset'
* fc/opt-quiet-gc-reset:
General --quiet improvements
| -rw-r--r-- | Documentation/git-reset.txt | 1 | ||||
| -rw-r--r-- | builtin-gc.c | 2 | ||||
| -rw-r--r-- | builtin-reset.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 2d27e405a3..9df6de2e7d 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -62,6 +62,7 @@ This means that `git reset -p` is the opposite of `git add -p` (see linkgit:git-add[1]). -q:: +--quiet:: Be quiet, only report errors. <commit>:: diff --git a/builtin-gc.c b/builtin-gc.c index 093517e390..c304638b78 100644 --- a/builtin-gc.c +++ b/builtin-gc.c @@ -180,12 +180,12 @@ int cmd_gc(int argc, const char **argv, const char *prefix) char buf[80]; struct option builtin_gc_options[] = { + OPT__QUIET(&quiet), { OPTION_STRING, 0, "prune", &prune_expire, "date", "prune unreferenced objects", PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire }, OPT_BOOLEAN(0, "aggressive", &aggressive, "be more thorough (increased runtime)"), OPT_BOOLEAN(0, "auto", &auto_gc, "enable auto-gc mode"), - OPT_BOOLEAN('q', "quiet", &quiet, "suppress progress reports"), OPT_END() }; diff --git a/builtin-reset.c b/builtin-reset.c index 11d1c6e4d6..31babd0b97 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() }; |