Andrew's git / gitweb.git / diff
?
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)
"git merge --quiet" did not squelch messages from the underlying
merge-recursive strategy.

* jk/merge-quiet:
merge: pass verbosity flag down to merge-recursive

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
diff --cc builtin/merge.c
Simple merge