summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-14 18:49:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-14 18:49:12 (GMT)
commit3cdff83fb0519bcfed35bca987c59d3557b1f2a7 (patch)
treea8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cb /builtin/merge.c
parentf8e593e9a71173eb6a813ac5f96e297847262128 (diff)
parent2bf15a3330a26183adc8563dbeeacc11294b8a01 (diff)
downloadgit-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.zip
git-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.tar.gz
git-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.tar.bz2
Merge branch 'jk/merge-quiet'
"git merge --quiet" did not squelch messages from the underlying merge-recursive strategy. * jk/merge-quiet: merge: pass verbosity flag down to merge-recursive
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 3b0f8f9..068a83b 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;