summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-14 11:49:12 -0700
committerJunio C Hamano <gitster@pobox.com>2015-04-14 11:49:12 -0700
commit3cdff83fb0519bcfed35bca987c59d3557b1f2a7 (patch)
treea8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cb /contrib
parentf8e593e9a71173eb6a813ac5f96e297847262128 (diff)
parent2bf15a3330a26183adc8563dbeeacc11294b8a01 (diff)
downloadgit-3cdff83fb0519bcfed35bca987c59d3557b1f2a7.tar.gz
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 'contrib')
0 files changed, 0 insertions, 0 deletions