From a58b00df4f66316648df6023fd5cd7879e418379 Mon Sep 17 00:00:00 2001
From: Charles Danesi <charles@charlesdanesi.net>
Date: Fri, 22 Nov 2024 08:19:32 -0500
Subject: [PATCH] add more git and yadm aliases

---
 .aliases | 72 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 .zshrc   |  1 -
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/.aliases b/.aliases
index 06d5d91..5f581e1 100644
--- a/.aliases
+++ b/.aliases
@@ -62,51 +62,107 @@ alias fkill='fzf-kill'
 
 # git
 alias g='git'
-alias gP='git push'
 alias ga='git add'
+alias gaa='git add --all'
+alias gb='git branch'
+alias gbd='git branch --delete'
 alias gc='git commit'
 alias gcm='git commit -m'
 alias gco='git checkout'
 alias gd='git diff'
+alias gdca='git diff --cached'
+alias gds='git diff --staged'
+alias gdup='git diff @{upstream}'
 alias gf='git fetch'
-alias glog='git log --oneline'
-alias gp='git pull'
+alias gfo='git fetch origin'
+alias gl='git pull'
+alias glg='git log --graph --decorate'
+alias glgs='git log --stat --graph --decorate'
+alias glgso='git log --oneline --stat --graph --decorate'
+alias glog='git log --oneline --graph --decorate'
+alias gm='git merge'
+alias gma='git merge --abort'
+alias gmc='git merge --continue'
+alias gmff='git merge --ff-only'
+alias gp='git push'
+alias gpd='git push --dry-run'
+alias gpr='git pull --rebase'
 alias gr='git remote'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbi='git rebase --interactive'
 alias grm='git rm'
 alias grmc='git rm --cached'
 alias grs='git restore'
 alias grset='git remote set-url'
 alias grst='git restore --staged'
 alias grup='git remote update'
+alias grv='git remote --verbose'
 alias gsb='git status --short --branch'
 alias gss='git status --short'
 alias gst='git status'
-alias 'glog!'='git log'
+alias gsta='git stash push'
+alias gstall='git stash --all'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'
+alias gsw='git switch'
+alias gswc='git switch -c'
+alias gswm='git switch $(git_main_branch)'
 
 # yadm
 alias y='yadm'
-alias yP='yadm push'
 alias ya='yadm add'
+alias yaa='yadm add --all'
+alias yb='yadm branch'
+alias ybd='yadm branch --delete'
 alias yc='yadm commit'
 alias ycm='yadm commit -m'
 alias yco='yadm checkout'
 alias yd='yadm diff'
 alias ydc='yadm decrypt'
+alias ydca='yadm diff --cached'
+alias yds='yadm diff --staged'
+alias ydup='yadm diff @{upstream}'
 alias yf='yadm fetch'
-alias ylog='yadm log --oneline'
+alias yfo='yadm fetch origin'
+alias yl='yadm pull'
+alias ylg='yadm log --graph --decorate'
+alias ylgs='yadm log --stat --graph --decorate'
+alias ylgso='yadm log --oneline --stat --graph --decorate'
+alias ylog='yadm log --oneline --graph --decorate'
+alias ym='yadm merge'
+alias yma='yadm merge --abort'
+alias ymc='yadm merge --continue'
+alias ymff='yadm merge --ff-only'
 alias ync='yadm encrypt'
-alias yp='yadm pull'
+alias yp='yadm push'
+alias ypd='yadm push --dry-run'
+alias ypr='yadm pull --rebase'
 alias yr='yadm remote'
+alias yrb='yadm rebase'
+alias yrba='yadm rebase --abort'
+alias yrbc='yadm rebase --continue'
+alias yrbi='yadm rebase --interactive'
 alias yrm='yadm rm'
 alias yrmc='yadm rm --cached'
 alias yrs='yadm restore'
 alias yrset='yadm remote set-url'
 alias yrst='yadm restore --staged'
 alias yrup='yadm remote update'
+alias yrv='yadm remote --verbose'
 alias ysb='yadm status --short --branch'
 alias yss='yadm status --short'
 alias yst='yadm status'
-alias 'ylog!'='yadm log'
+alias ysta='yadm stash push'
+alias ystall='yadm stash --all'
+alias ystd='yadm stash drop'
+alias ystl='yadm stash list'
+alias ystp='yadm stash pop'
+alias ysw='yadm switch'
+alias yswc='yadm switch -c'
+alias yswm='yadm switch main'
 
 # LazyGit (yadm)
 alias lazyy='lazygit -ucd ~/.local/share/yadm/lazygit -w ~ -g ~/.local/share/yadm/repo.git'
diff --git a/.zshrc b/.zshrc
index 55a9122..70d1295 100644
--- a/.zshrc
+++ b/.zshrc
@@ -79,7 +79,6 @@ plugins=(
    colored-man-pages
    dotenv
    genpass
-   git
    ssh
    ssh-agent
    sudo