| commit | 7e46f27fa627c0f9f6f547bef53e5aa2de52dec5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:23 +0000 (5 12:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:23 +0000 (5 12:00 -0700) | ||
| tree | f34a803234c9560ed7e28f3459c948cd11b3f01b | treesnapshot (tar.gz zip) |
| parent | 06629901444888e5fa491c5f5f24ff03686af9a9 | commitdiff |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 | commitdiff |
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
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 | blobhistory |