| commit | 064a0827b9c88852974359da9085037f985babc3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 May 2015 22:07:16 +0000 (20 15:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 May 2015 22:07:16 +0000 (20 15:07 -0700) | ||
| tree | b378c9736aed4c2a6bebd35ea95eec477940982f | treesnapshot (tar.gz zip) |
| parent | 2b14ed73683467e79f83055f6bb46d31d05d847d | commitdiff |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 | commitdiff |
Merge branch 'pt/pull-ff-vs-merge-ff' into next
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 |