diff options
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3b0f8f96d4..068a83b328 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -684,6 +684,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; |