| commit | ebf4fc90da239f1005d2c5b1a4278cfe51430151 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:16 +0000 (25 11:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Jun 2015 18:02:17 +0000 (25 11:02 -0700) | ||
| tree | fbbf73c27da9cda04725eb7f5b21432db8622b93 | treesnapshot (tar.gz zip) |
| parent | 5fd72277d468ecf6b5685dbff14e8a4b2de8eb77 | commitdiff |
| parent | fc0aa395f3205a049e917d391e2afa93cda0c8af | commitdiff |
Merge branch 'sg/merge-summary-config' into maint
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 |