Files
git/Documentation
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
..
2015-05-22 12:53:21 -07:00
2015-05-11 14:39:28 -07:00
2014-11-04 13:14:44 -08:00
2013-09-04 12:23:25 -07:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2015-05-11 14:39:28 -07:00
2015-05-19 13:17:57 -07:00
2013-10-18 13:50:12 -07:00
2015-04-28 13:00:18 -07:00
2013-04-12 12:00:52 -07:00
2015-05-13 14:35:05 -07:00
2014-11-04 13:14:44 -08:00
2015-01-22 13:44:14 -08:00