projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5fd7227 fc0aa39)
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)
commitebf4fc90da239f1005d2c5b1a4278cfe51430151
treefbbf73c27da9cda04725eb7f5b21432db8622b93tree | snapshot
parent5fd72277d468ecf6b5685dbff14e8a4b2de8eb77commit | diff
parentfc0aa395f3205a049e917d391e2afa93cda0c8afcommit | diff
Merge branch 'sg/merge-summary-config' into maint

Doc updates.

* sg/merge-summary-config:
  Documentation: include 'merge.branchdesc' for merge and config as well
Documentation/merge-config.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.