Andrew's git / gitweb.git / diff
?
Merge branch 'sg/merge-summary-config' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:16 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 18:02:17 +0000 (11:02 -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