# Pull & push
alias gl='git pull --prune'
alias glr='gl --rebase'
alias gp='git push origin HEAD'
alias gpu='git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)'
alias gpfl='gp --force-with-lease'

# Log & diff
alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
# alias gd='git difftool -y -x "colordiff -y -W $COLUMNS" | less -rXF'
# alias gd='git diff | cdiff -s -w 0'
alias gd='git diff'

# Repo & branch lifecycle
alias gco='git checkout'
alias gb='git branch'
alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
alias ga='git add'
alias gaa='ga .'
alias gc='git commit'
alias gca='git commit -a'

# Helpful additions
alias gms="git merge origin/staging"
alias grs="git rebase origin/staging"

# Pull & push
alias gl='git pull --prune'
alias glr='gl --rebase'
alias gp='git push origin HEAD'
alias gpu='git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)'
alias gpfl='gp --force-with-lease'

# Log & diff
alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
# alias gd='git difftool -y -x "colordiff -y -W $COLUMNS" | less -rXF'
alias gd='git diff | cdiff -s -w 0'

# Repo & branch lifecycle
alias gco='git checkout'
alias gb='git branch'
alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
alias ga='git add'
alias gaa='ga .'
alias gc='git commit'
alias gca='git commit -a'

# Helpful additions
alias gms="git merge origin/staging"
alias grs="git rebase origin/staging"

--- 
+++ 
@@ -8,8 +8,7 @@
 # Log & diff
 alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
 # alias gd='git difftool -y -x "colordiff -y -W $COLUMNS" | less -rXF'
-# alias gd='git diff | cdiff -s -w 0'
-alias gd='git diff'
+alias gd='git diff | cdiff -s -w 0'
 
 # Repo & branch lifecycle
 alias gco='git checkout'
feat(Git): Remove pipe to cdiff, build in diff is doing just fine now
