From 3a47824501deff4c6f9e6382b0d77e081e71c04a Mon Sep 17 00:00:00 2001
From: Zheeeng <air.island.e@gmail.com>
Date: Mon, 2 May 2016 14:38:50 +0800
Subject: [PATCH] Update git.plugin.zsh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add/change aliases:
* gbav: list all branches and their upstream branches
* gcam!, gcmsg!: feed amend option
* gclean!: clean operation should be used with caution
* grp: prune remote branches which don't exist anymore
* grao, grpo: add/prune remote repository—origin
---
 plugins/git/git.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 95ce1ae26..3051d621f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -46,6 +46,7 @@ alias gapa='git add --patch'
 
 alias gb='git branch'
 alias gba='git branch -a'
+alias gbav='git branch -avv'
 alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -62,13 +63,15 @@ alias gca='git commit -v -a'
 alias gca!='git commit -v -a --amend'
 alias gcan!='git commit -v -a -s --no-edit --amend'
 alias gcam='git commit -a -m'
+alias gcam!='git commit -a --amend -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recursive'
-alias gclean='git clean -fd'
+alias gclean!='git clean -fd'
 alias gpristine='git reset --hard && git clean -dfx'
 alias gcm='git checkout master'
 alias gcmsg='git commit -m'
+alias gcmsg!='git commit --amend -m'
 alias gco='git checkout'
 alias gcount='git shortlog -sn'
 compdef gcount=git
@@ -173,6 +176,9 @@ alias gpv='git push -v'
 
 alias gr='git remote'
 alias gra='git remote add'
+alias grao='git remote add origin'
+alias grp='git remote prune'
+alias grpo='git remote prune origin'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'