Andrew's git / gitweb.git / diff
?
Merge branch 'sg/merge-summary-config'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:05 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:05 +0000 (14:27 -0700)
Doc updates.

* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well

1  2 
Documentation/merge-config.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/merge-config.txt
Simple merge