pull: make pull.ff=true override merge.ff
authorPaul Tan <pyokagan@gmail.com>
Mon, 18 May 2015 13:45:41 +0000 (21:45 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2015 18:22:27 +0000 (11:22 -0700)
commiteb8dc05...3d364174a6b694e2850ffd6cfe32c6d3
treef462cc6...dabea04bdf6e6ea0441bbca279899edecopy hash to clipboard (tree)
parent3d4a3ff...64162b45ae7c991fc60623ecb4678cfdcopy hash to clipboard (diff)
Documentation/config.txt
git-pull.sh
t/t7601-merge-pull-config.sh