Git: Switch to pull.rebase preserve

see
http://stackoverflow.com/questions/15915430/what-exactly-does-gits-rebase-preserve-merges-do-and-why
for a discussion