Skip to content

Commit

Permalink
Merge branch 'jk/merge-quiet'
Browse files Browse the repository at this point in the history
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.

* jk/merge-quiet:
  merge: pass verbosity flag down to merge-recursive
  • Loading branch information
Junio C Hamano committed Apr 14, 2015
2 parents f8e593e + 2bf15a3 commit 3cdff83
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions builtin/merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 3cdff83

Please sign in to comment.