don't preserve merges by default when rebasing

causes commits to be skipped in some cases :-/

.alias.d/git.sh

@@ -206,7 +206,7 @@ alias gmf='git merge --ff'
 # r = rebase
 #-----------------------------------------------------------------------------
 
-alias gr='git rebase --preserve-merges'
+alias gr='git rebase'
 alias gri='git rebase --interactive'
 alias grc='git rebase --continue'
 alias gra='git rebase --abort'