From b188b8db54eccb7b92a434ea5c20d19b14ca30ee Mon Sep 17 00:00:00 2001
From: "Suraj N. Kurapati" <sunaku@gmail.com>
Date: Wed, 7 Nov 2012 15:02:56 -0800
Subject: [PATCH] don't preserve merges by default when rebasing

causes commits to be skipped in some cases :-/
---
 .alias.d/git.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.alias.d/git.sh b/.alias.d/git.sh
index 84f8a6cc..f6526ac2 100644
--- a/.alias.d/git.sh
+++ b/.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'