Merge branch 'pt/pull-ff-vs-merge-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
commit7e46f27...a627c0f9f6f547bef53e5aa2de52dec5
treef34a803...34c9560ed7e28f3459c948cd11b3f01bcopy hash to clipboard (tree)
parent0662990...444888e5fa491c5f5f24ff03686af9a9copy hash to clipboard (diff)
parentdb9bb28...ed7df7858a2de5d1d0334114dd837be0copy hash to clipboard (diff)
Documentation/config.txt