diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-26 20:24:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 20:24:44 (GMT) |
| commit | 22a1ae6ef2ba77a20113bbee6f706ec47e6440c5 (patch) | |
| tree | a0e534be2cee8b603cf3dd20879a31ce673e923e /sha1-lookup.c | |
| parent | 14230580af96353b911ec1de85517d71c8cfe6b8 (diff) | |
| parent | db9bb280ed7df7858a2de5d1d0334114dd837be0 (diff) | |
| download | git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.zip git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.tar.gz git-22a1ae6ef2ba77a20113bbee6f706ec47e6440c5.tar.bz2 | |
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
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions