Merge branch 'jk/rerere-forget-check-enabled' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index 068a83b328a2429e5ab1909652a66ffb5b234382..3b0f8f96d4168463139d15f1cde655facc73426c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -684,10 +684,6 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
                        o.subtree_shift = "";
 
                o.renormalize = option_renormalize;
-               if (verbosity < 0)
-                       o.verbosity = verbosity;
-               else if (verbosity > 0)
-                       o.verbosity += verbosity;
                o.show_rename_progress =
                        show_progress == -1 ? isatty(2) : show_progress;