| commit | 3cdff83fb0519bcfed35bca987c59d3557b1f2a7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Apr 2015 18:49:12 +0000 (14 11:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Apr 2015 18:49:12 +0000 (14 11:49 -0700) | ||
| tree | a8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cb | treesnapshot (tar.gz zip) |
| parent | f8e593e9a71173eb6a813ac5f96e297847262128 | commitdiff |
| parent | 2bf15a3330a26183adc8563dbeeacc11294b8a01 | commitdiff |
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
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.
* jk/merge-quiet:
merge: pass verbosity flag down to merge-recursive
| builtin/merge.c | diff1 | diff2 | blobhistory |