From 69b4eada17b8208fa3b1a03a0c77b5c6308850e6 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 26 Jun 2011 15:56:13 -0700
Subject: [PATCH] update git aliases

---
 zsh/zshrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zsh/zshrc b/zsh/zshrc
index 1220bde..67e2137 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -261,7 +261,8 @@ alias m='hub merge'
 alias pob='git-pull-origin-branches'
 alias r='hub remote'
 alias ra='hub remote add'
-alias rbi='git rebase -i'
+alias rbi='git rebase -i --autosquash'
+alias rbiom='git rebase -i --autosquash origin/master'
 alias t='git tag'
 GIT_VERSION="$(git --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')"
 GIT_VERSION_MAJOR="${GIT_VERSION%%.*}"