Merge branch 'pt/pull-ff-vs-merge-ff'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:43 +0000 (13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:44 +0000 (13:24 -0700)
commit22a1ae6...f2ba77a20113bbee6f706ec47e6440c5
treea0e534b...2cee8b603cf3dd20879a31ce673e923ecopy hash to clipboard (tree)
parent1423058...af96353b911ec1de85517d71c8cfe6b8copy hash to clipboard (diff)
parentdb9bb28...ed7df7858a2de5d1d0334114dd837be0copy hash to clipboard (diff)
Documentation/config.txt
git-pull.sh