| commit | c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:27:05 +0000 (16 14:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:27:05 +0000 (16 14:27 -0700) | ||
| tree | 4acab92baf40a8369e78a396ef343c75522345cd | treesnapshot (tar.gz zip) |
| parent | 412e63f0fd683addc380f9c65d05306bd2027039 | commitdiff |
| parent | fc0aa395f3205a049e917d391e2afa93cda0c8af | commitdiff |
Merge branch 'sg/merge-summary-config'
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
| Documentation/merge-config.txt | diff1 | diff2 | blobhistory |