Junio C Hamano 22a1ae6ef2 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

2015-05-26 13:24:44 -07:00

8.5 KiB

Executable File

Raw Blame History

View Raw