git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 412e63f fc0aa39)
Merge branch 'sg/merge-summary-config'
authorJunio C Hamano <redacted>
Tue, 16 Jun 2015 21:27:05 +0000 (14:27 -0700)
committerJunio C Hamano <redacted>
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
git clone https://git.99rst.org/PROJECT