summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <programble@gmail.com>2015-01-06 16:31:28 -0500
committerJune McEnroe <programble@gmail.com>2015-01-06 16:31:28 -0500
commit443ffa67049801abc11cf6fbbeda2e95b3991357 (patch)
treec88614ad623999ae2567a445c4bea80b916d8967
parentAdd vman alias for vim-superman (diff)
downloadsrc-443ffa67049801abc11cf6fbbeda2e95b3991357.tar.gz
src-443ffa67049801abc11cf6fbbeda2e95b3991357.zip
Add git rebase aliases
-rw-r--r--.zsh/aliases.zsh5
1 files changed, 4 insertions, 1 deletions
diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh
index 6cdf6f7a..00ba1d57 100644
--- a/.zsh/aliases.zsh
+++ b/.zsh/aliases.zsh
@@ -58,7 +58,10 @@ alias glg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset
 alias gm='git merge'
 alias gmv='git mv'
 alias gp='git push'
-alias gr='git remote'
+alias gr='git rebase'
+alias grc='git rebase --continue'
+alias grs='git rebase --skip'
+alias gra='git rebase --abort'
 alias grm='git rm'
 alias gs='git status -sb'
 alias gsh='git show'
r'>2012-02-11Customize C/C++ indentationJune McEnroe 2012-02-07Update Powerline to 'develop' branchJune McEnroe 2012-02-07Add Solarized colorschemeJune McEnroe 2012-02-07Add back set nocompatible, even though it seemed to end up set anywayJune McEnroe 2012-02-05Update jellybeansJune McEnroe 2012-02-02Update itchy.vimJune McEnroe 2012-02-02Add mapping to toggle relative/absolute numberingJune McEnroe 2012-02-02Add itchy.vimJune McEnroe 2012-02-01Revert "Add ShowMarks plugin"June McEnroe This reverts commit ddcfaef5145595f8e15f34f091e50fb85a9a6149. 2012-02-01Add ShowMarks pluginJune McEnroe 2012-02-01Update Vim-Tomorrow-ThemeJune McEnroe 2012-02-01Add vim-markdownJune McEnroe 2012-02-01Add tabular.vimJune McEnroe 2012-02-01Update Vim-Tomorrow-ThemeJune McEnroe PS. Chris Kempson is a jerk. 2012-01-30Disable menu bar in GVimJune McEnroe 2012-01-30Set shiftwidth to 4 for LuaJune McEnroe 2012-01-29Don't show Syntastic errors automaticallyJune McEnroe 2012-01-28Update to Quicktask 1.1June McEnroe 2012-01-22Use space-test branch of quicktaskJune McEnroe 2012-01-22Enable syntax-based foldingJune McEnroe 2012-01-22Update quicktaskJune McEnroe 2012-01-22Revert "Add AutoClose"June McEnroe This reverts commit 2705f4b91a56caf4cf2b3b89b247580debd5d453. This fixes the delay when leaving insert mode 2012-01-22Revert "Disable powerline for now"June McEnroe This reverts commit 171b1aa0d1d445a1223d0d638f2798b780c3e1ce. 2012-01-22Revert "Add VCS repo directories to wildignore"June McEnroe This reverts commit f4cc36a0aca465eea866fa7131a19497d46e63f0. This fixes not being able to commit with vim-fugitive 2012-01-22Disable powerline for nowJune McEnroe 2012-01-22Update some pluginsJune McEnroe 2012-01-22Add VCS repo directories to wildignoreJune McEnroe 2012-01-22Map ,e and ,b to CtrlP file and buffer respectivelyJune McEnroe 2012-01-22Add vim-spaceJune McEnroe 2012-01-22Add AutoCloseJune McEnroe 2012-01-22Add binding for GundoJune McEnroe 2012-01-22Add GundoJune McEnroe 2012-01-22Add Jellybeans colorschemeJune McEnroe 2012-01-22Add syntasticJune McEnroe 2012-01-21Add PowerlineJune McEnroe 2012-01-21Add quicktaskJune McEnroe 2012-01-15Moved comments out of mapsJune McEnroe 2012-01-14Disable scrollbarsJune McEnroe