From 7268805d36c6a6d1a334f138160ea7b417af5c9b Mon Sep 17 00:00:00 2001
From: Fred Klassen <fred.klassen@broadcom.com>
Date: Wed, 28 Jun 2023 09:52:48 -0700
Subject: [PATCH] more git aliases, less pager, iterm2 support

---
 custom/aliases.zsh           | 22 +++++++++++++++++++++-
 templates/gitconfig          |  2 ++
 templates/zshrc.zsh-template |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/custom/aliases.zsh b/custom/aliases.zsh
index 12e7d0857..9a033c914 100644
--- a/custom/aliases.zsh
+++ b/custom/aliases.zsh
@@ -2,6 +2,15 @@
 
 ohmyzsh=$HOME/.oh-my-zsh
 
+gcohistory() {
+  i=0
+  while [ $? -eq 0 ]; do
+    i=$((i+1))
+    echo -n "$i. "
+    git rev-parse --symbolic-full-name @{-$i} 2> /dev/null
+  done
+}
+
 # Get operating system
 platform='unknown'
 unamestr=$(uname)
@@ -35,7 +44,7 @@ TRAPHUP() {
   source $ohmyzsh/custom/aliases.zsh
 }
 
-alias ae='vi $ohmyzsh/custom/aliases.zsh'      #alias edit
+alias ae='vi $ohmyzsh/custom/aliases.zsh'         #alias edit
 alias arl='source $oh-my-zsh/custom/aliases.zsh'  #alias reload
 alias gar="killall -HUP -u \"$USER\" zsh"         #global alias reload
 
@@ -60,3 +69,14 @@ if [ ! "$MSYSTEM" = "MINGW64" ]; then
   alias ls='exa'
   alias la='ll -a'
 fi
+
+# git
+alias gcoh="gcohistory"
+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-'
+alias 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 gdtree='git diff-tree'
+
diff --git a/templates/gitconfig b/templates/gitconfig
index 9b38a12ee..75c292410 100644
--- a/templates/gitconfig
+++ b/templates/gitconfig
@@ -125,6 +125,7 @@
   autocrlf = false
   editor = vim
   excludesfile = ~/.yadr/git/gitignore
+  pager = less -F -X
 [advice]
   statusHints = false
 [diff]
@@ -142,3 +143,4 @@
 	program = gpg
 [commit]
 	gpgsign = true
+
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index de39a8c9e..a3a717116 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -138,6 +138,7 @@ esac
 # macOS only optional plugins
 case "$(uname)" in
 Darwin) plugins+=(
+          iterm2
           brew
           forklift  # requires ForkLift from App Store
         )