Merge branch 'da/pull-ff-configuration'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:11 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:11 +0000 (14:01 -0800)
commit7da5fd6...95af9066ad4684e333c57f4086589c2f
tree17f5d71...d315e3106cb56c60b3edf87e9976d3a0copy hash to clipboard (tree)
parentd637d1b...a8fb765a8542e69bd2e04b3e229f663bcopy hash to clipboard (diff)
parentef93e3a...9c3b2b62c6c450f862ce1626bc8dab54copy hash to clipboard (diff)
Documentation/config.txt
git-pull.sh