git: Add some more OhMyZsh-compatible aliases

[ax-zsh.git] / plugins / git / git.zshrc

diff --git a/plugins/git/git.zshrc b/plugins/git/git.zshrc
index 4d796ef48a5590d67a8111fbbc8df5452dbff3b1..5073cc5e30f7c7b54cf1b6302381377b6e5e74a3 100644 (file)
--- a/plugins/git/git.zshrc
+++ b/plugins/git/git.zshrc
@@ -57,11 +57,37 @@ git_prompt() {
 # OhMyZsh compatibility functions
 alias parse_git_dirty=git_parse_dirty
 
-ax_vcs_prompt_functions=($ax_vcs_prompt_functions git_prompt)
+axzsh_vcs_prompt_functions=($axzsh_vcs_prompt_functions git_prompt)
 
-alias ga="git add"
-alias gc="git commit"
-alias gd="git diff --patch-with-stat"
-alias gdc="git diff --patch-with-stat --cached"
-alias gst="git status --short --branch --untracked"
-alias fix="git diff --name-only | uniq | xargs $EDITOR"
+alias fix="gd --name-only | uniq | xargs $EDITOR"
+alias g="git"
+alias ga="g add"
+alias gapa="ga --patch"
+alias gc="g commit --verbose"
+alias gc!="gc --amend"
+alias gca="gc --all"
+alias gcam="gca --message"
+alias gcmsg="gc --message"
+alias gcn="gc --no-edit"
+alias gcn!="gcn --amend"
+alias gco="g checkout"
+alias gd="g diff"
+alias gdca="gd --cached"
+alias gdcw="gdca --word-diff"
+alias gdw="gd --word-diff"
+alias gf="g fetch"
+alias gfa="gf --all --prune"
+alias gfo="gf origin"
+alias gl="g pull"
+alias glo="g log --oneline --decorate"
+alias gp="g push"
+alias gr="g remote"
+alias grb="g rebase"
+alias grbi="grb --interactive"
+alias gsb="gss --branch"
+alias gsh="g show"
+alias gss="gst --short"
+alias gst="g status"
+alias gsta="g stash"
+alias gstl="gsta list"
+alias gstp="gsta pop"