From: Junio C Hamano Date: Tue, 26 May 2015 20:24:43 +0000 (-0700) Subject: Merge branch 'pt/pull-ff-vs-merge-ff' X-Git-Tag: v2.5.0-rc0~76 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/22a1ae6ef2ba77a20113bbee6f706ec47e6440c5 Merge branch 'pt/pull-ff-vs-merge-ff' 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 --- 22a1ae6ef2ba77a20113bbee6f706ec47e6440c5