Permalink
Browse files

don't preserve merges by default when rebasing

causes commits to be skipped in some cases :-/
  • Loading branch information...
1 parent 36b93c3 commit b188b8db54eccb7b92a434ea5c20d19b14ca30ee @sunaku committed Nov 7, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .alias.d/git.sh
View
@@ -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'

0 comments on commit b188b8d

Please sign in to comment.