mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
3cdff83fb0
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue