pull: add pull.ff configuration
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Jan 2014 23:18:38 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Jan 2014 00:01:06 +0000 (16:01 -0800)
commitb814da8...1e8261b909fc5d9fb07b4e8b13989c2d
tree20bdca7...6012df5441dbfc5bdaab9a75e9649c7dcopy hash to clipboard (tree)
parent4224916...e979204f13db2996d9e32490e0acb90fcopy hash to clipboard (diff)
Documentation/config.txt
git-pull.sh
t/t7601-merge-pull-config.sh