Merge branch 'jn/maint-fast-import-object-reuse'

diff --git a/builtin/reset.c b/builtin/reset.c
index 0037be4693bbd875e644df13ce4a9fae31e7378c..5de2bceeec8c1d243ed6da70464d0c4dd60d7352 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -243,7 +243,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__QUIET(&quiet, "be quiet, only report errors"),
                OPT_SET_INT(0, "mixed", &reset_type,
                                                "reset HEAD and index", MIXED),
                OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),