diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:12 -0700 |
| commit | 3cdff83fb0519bcfed35bca987c59d3557b1f2a7 (patch) | |
| tree | a8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cb /builtin | |
| parent | Merge branch 'jk/pack-corruption-post-mortem' (diff) | |
| parent | merge: pass verbosity flag down to merge-recursive (diff) | |
| download | tgif-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.tar.xz | |
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')
| -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; |