From b4dec8b5229e8df9d1c14d348887b47932cdfe0b Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Tue, 1 Jun 2021 15:00:41 +0200
Subject: [PATCH] git: Bring aliases in line with OhMyZsh (and extend our
 list!)

Changed:
* gc: Add "--verbose"
* gd: Remove "--patch-with-stat"
* gst: Use default format

Removed:
* gdc: Deprecated in OhMyZsh ...

New:
* g
* gapa
* gdca
* gdcw
* gdw
* gf
* gfa
* gl
* gp
* gsb
* gsh
* gss
---
 plugins/git/git.zshrc | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/git/git.zshrc b/plugins/git/git.zshrc
index 4d796ef..de730b7 100644
--- a/plugins/git/git.zshrc
+++ b/plugins/git/git.zshrc
@@ -59,9 +59,20 @@ alias parse_git_dirty=git_parse_dirty
 
 ax_vcs_prompt_functions=($ax_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 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 gl="g pull"
+alias gp="g push"
+alias gsb="gss --branch"
+alias gsh="g show"
+alias gss="gst --short"
+alias gst="g status"
-- 
2.39.2