My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8e593e 2bf15a3)
Merge branch 'jk/merge-quiet'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 18:49:12 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Apr 2015 18:49:12 +0000 (11:49 -0700)
commit3cdff83fb0519bcfed35bca987c59d3557b1f2a7
treea8c7e2795b7d38eafd3ee7563c3a5223c8e3e2cbtree | snapshot
parentf8e593e9a71173eb6a813ac5f96e297847262128commit | diff
parent2bf15a3330a26183adc8563dbeeacc11294b8a01commit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
The core git plumbing