Added pull.rebase = preserve to .gitconfig so that explicit merge
commits are not removed by the rebasing.