Add feature for git 1.8.5+ for preserve merges (rebase will save merge commits)