Andrew's git / gitweb.git / diff
?
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)
The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.

* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
git-pull.sh patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc git-pull.sh
Simple merge