]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1423058 db9bb28)
Merge branch 'pt/pull-ff-vs-merge-ff'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:43 +0000 (13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:24:44 +0000 (13:24 -0700)
commit22a1ae6ef2ba77a20113bbee6f706ec47e6440c5
treea0e534be2cee8b603cf3dd20879a31ce673e923etree | snapshot
parent14230580af96353b911ec1de85517d71c8cfe6b8commit | diff
parentdb9bb280ed7df7858a2de5d1d0334114dd837be0commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
git-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.