From 7cc8cbbf8762ed99977f841b3476adac89cdfaa0 Mon Sep 17 00:00:00 2001
From: Fred Klassen <fklassen@appneta.com>
Date: Wed, 8 Feb 2023 10:32:26 -0800
Subject: [PATCH] aliases

---
 README-MY-SETUP.md           |  1 -
 templates/zshrc.zsh-template | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README-MY-SETUP.md b/README-MY-SETUP.md
index 8d4c42020..e43ea4f78 100644
--- a/README-MY-SETUP.md
+++ b/README-MY-SETUP.md
@@ -72,7 +72,6 @@ Windows
 -------
 
 * Install [Windows Terminal](https://github.com/microsoft/terminal)
-* Recommend using WSL2 with Ubuntu and zsh installed there, but may be able to use Git Bash `wsl --install` (in Admin command prompt)
 * other steps TBD
 * continue to [Common Install Steps](#common-install-steps)
 
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index a03212e84..a2585409c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -128,7 +128,21 @@ export MANPATH="/usr/local/man:/usr/local/ssl/share/man:$MANPATH"
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+alias gld="git log --pretty=format:'%C(yellow)%h%C(reset) - %an [%C(green)%ar%C(reset)] %s'"
+alias glsi='git ls-files --other --ignored --exclude-standard'
+alias galiases='git config -l | grep alias | cut -c 7-'
+gls='git log --stat --decorate --source -p'
+alias glhistg="git log --graph --pretty=format:'%C(yellow)%h%C(bold white red)%d%Creset %s %C(bold green)%cr %Creset%C(white)%an' --abbrev-commit --date=relative"
+alias gdmb='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d'
+alias gnb='git nb' # new branch aka checkout -b
+alias gdtree='git diff-tree'
+alias gdt='git difftool'
+alias gmt='git mergetool'
+unalias rm
+# Homebrew upgrade packages (macOS only)
+alias brewu='brew update && brew upgrade && brew cleanup && brew doctor'
 
+# Other custom config
 [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
 ZSH_ALIAS_FINDER_AUTOMATIC=true