git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0662990 db9bb28)
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
authorJunio C Hamano <redacted>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
committerJunio C Hamano <redacted>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
commit7e46f27fa627c0f9f6f547bef53e5aa2de52dec5
treef34a803234c9560ed7e28f3459c948cd11b3f01btree | snapshot
parent06629901444888e5fa491c5f5f24ff03686af9a9commit | diff
parentdb9bb280ed7df7858a2de5d1d0334114dd837be0commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT