From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:23 +0000 (-0700)
Subject: Merge branch 'pt/pull-ff-vs-merge-ff' into maint
X-Git-Tag: v2.4.3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7e46f27fa627c0f9f6f547bef53e5aa2de52dec5?ds=inline;hp=--cc

Merge branch 'pt/pull-ff-vs-merge-ff' into maint

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
---

7e46f27fa627c0f9f6f547bef53e5aa2de52dec5