merge: pass verbosity flag down to merge-recursive

diff --git a/builtin/merge.c b/builtin/merge.c
index 8763b2efa2d7e3d7af49e9bc160a67239fbd3147..4b200b5b95b462496befe2a67f48c39a34b51edc 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -687,6 +687,10 @@ 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;