]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0662990 db9bb28)
Merge branch 'pt/pull-ff-vs-merge-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:23 +0000 (12:00 -0700)
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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.