From: Joerg Jaspert <joerg.jaspert@dlh.de>
Date: Thu, 3 Mar 2016 08:50:20 +0000 (+0100)
Subject: Adjust git aliases, git remote is now gre, git rebase takes gr, used way more often
X-Git-Url: https://git.ganneff.de//index.cgi?p=zsh.git;a=commitdiff_plain;h=5e81ae7119420a970962e02aefabb194d46f0dce

Adjust git aliases, git remote is now gre, git rebase takes gr, used way more often
---

diff --git a/.zsh/35_Aliases.zsh b/.zsh/35_Aliases.zsh
index fe086b1..692c8b4 100644
--- a/.zsh/35_Aliases.zsh
+++ b/.zsh/35_Aliases.zsh
@@ -197,22 +197,29 @@ alias gg='git grep'
 #a# list commit count summary
 alias gcount='git shortlog -sn'
 
-
+# rebasing
+#a# rebase
+alias gr='git rebase'
+#a# rebase interactive on master
+alias gri='git rebase -i master'
+#a# continue rebase
+alias grc='git rebase --continue'
+#a# abort rebase
+alias gra='git rebase --abort'
 
 
 # remotes
 #a# list remotes
-alias gr='git remote'
+alias gre='git remote'
 #a# list remotes including their fetch/push details
-alias grv='git remote -v'
-alias grmv='git remote rename'
-alias grrm='git remote remove'
+alias grev='git remote -v'
+alias gremv='git remote rename'
+alias grerm='git remote remove'
 
 # Will cd into the top of the current repository
 # or submodule.
 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
 
-
 ## global aliases. Handle with care!
 alias -g LS='| less'
 alias -g LL="|& less"