| commit | 22a1ae6ef2ba77a20113bbee6f706ec47e6440c5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:24:43 +0000 (26 13:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:24:44 +0000 (26 13:24 -0700) | ||
| tree | a0e534be2cee8b603cf3dd20879a31ce673e923e | treesnapshot (tar.gz zip) |
| parent | 14230580af96353b911ec1de85517d71c8cfe6b8 | commitdiff |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 | commitdiff |
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
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 |
| git-pull.sh | diff1 | diff2 | blobhistory |