I can see in current git docs that ff-only is now default behavior for git pull (which is awesome). Can anyone find what version introduced this change? As I recall, git would just happily merge in more complicated scenarios before. I had a look around in the release docs but was ultimately unsuccessful.