diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 11:02:17 -0700 |
commit | ebf4fc90da239f1005d2c5b1a4278cfe51430151 (patch) | |
tree | fbbf73c27da9cda04725eb7f5b21432db8622b93 /config.mak.in | |
parent | 5fd72277d468ecf6b5685dbff14e8a4b2de8eb77 (diff) | |
parent | fc0aa395f3205a049e917d391e2afa93cda0c8af (diff) | |
download | git-ebf4fc90da239f1005d2c5b1a4278cfe51430151.tar.gz |
Merge branch 'sg/merge-summary-config' into maint
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'config.mak.in')
0 files changed, 0 insertions, 0 deletions