diff --git a/plugins/git/git.plugin.sh b/plugins/git/git.plugin.sh
index 912f7d7d5..9c4ac609c 100644
--- a/plugins/git/git.plugin.sh
+++ b/plugins/git/git.plugin.sh
@@ -17,12 +17,6 @@ function current_repository() {
   fi
   echo $($_omb_git_git_cmd remote -v | cut -d':' -f 2)
 }
-# Pretty log messages
-function _git_log_prettily(){
-  if ! [ -z $1 ]; then
-    git log --pretty=$1
-  fi
-}
 # Warn if the current branch is a WIP
 function work_in_progress() {
   if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
@@ -30,9 +24,37 @@ function work_in_progress() {
   fi
 }
 
+# Check for develop and similarly named branches
+function git_develop_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local branch
+  for branch in dev devel development; do
+    if command git show-ref -q --verify refs/heads/"$branch"; then
+      echo "$branch"
+      return
+    fi
+  done
+  echo develop
+}
+
+# Check if main exists and use instead of master
+function git_main_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local ref
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do
+    if command git show-ref -q --verify "$ref"; then
+      echo "${ref##*/}"
+      return
+    fi
+  done
+  echo master
+}
+
 #
 # Aliases
-# (sorted alphabetically)
+#
+# From Oh-My-Zsh:
+# https://github.com/ohmyzsh/ohmyzsh/blob/f36c6db0eac17b022eee87411e6996a5f5fc8457/plugins/git/git.plugin.zsh
 #
 
 alias g='command git'
@@ -41,214 +63,318 @@ alias ga='command git add'
 alias gaa='command git add --all'
 alias gapa='command git add --patch'
 alias gau='command git add --update'
+alias gav='command git add --verbose'
+alias gwip='command git add -A; command git rm $(git ls-files --deleted) 2> /dev/null; command git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
+
+alias gam='command git am'
+alias gama='command git am --abort'
+alias gamc='command git am --continue'
+alias gamscp='command git am --show-current-patch'
+alias gams='command git am --skip'
+
+alias gap='command git apply'
+alias gapt='command git apply --3way'
+
+alias gbl='command git blame -b -w'
 
 alias gb='command git branch'
+alias gbD='command git branch --delete --force'
 alias gba='command git branch -a'
 alias gbd='command git branch -d'
-alias gbD='command git branch --delete --force'
-alias gbda='command git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
-alias gbl='command git blame -b -w'
+alias gbda='command git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
+alias gbg='LANG=C command git branch -vv | grep ": gone\]"'
+alias gbgD='LANG=C command git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | command xargs git branch -D'
+alias gbgd='LANG=C command git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | command xargs git branch -d'
+alias gbm='command git branch --move'
 alias gbnm='command git branch --no-merged'
 alias gbr='command git branch --remote'
+alias gbsc='command git branch --show-current'
+alias ggsup='command git branch --set-upstream-to="origin/$(git_current_branch)"'
+
 alias gbs='command git bisect'
 alias gbsb='command git bisect bad'
-alias gbsc='command git branch --show-current'
 alias gbsg='command git bisect good'
+alias gbsn='command git bisect new'
+alias gbso='command git bisect old'
 alias gbsr='command git bisect reset'
 alias gbss='command git bisect start'
 
-alias gc='command git commit -v'
-alias gc!='command git commit -v --amend'
-alias gcn!='command git commit -v --no-edit --amend'
-alias gca='command git commit -v -a'
-alias gca!='command git commit -v -a --amend'
-alias gcan!='command git commit -v -a --no-edit --amend'
-alias gcans!='command git commit -v -a -s --no-edit --amend'
-alias gcam='command git commit -a -m'
-alias gcsm='command git commit -s -m'
 alias gcb='command git checkout -b'
-alias gcf='command git config --list'
-alias gcl='command git clone --recursive'
-alias gclean='command git clean -fd'
-alias gpristine='command git reset --hard && git clean -dfx'
-alias gcm='command git checkout master'
-alias gcd='command git checkout develop'
-alias gcmsg='command git commit -m'
+alias gcd='command git checkout "$(git_develop_branch)"'
+alias gcm='command git checkout "$(git_main_branch)"'
 alias gco='command git checkout'
-alias gcount='command git shortlog -sn'
-#compdef _git gcount complete -F _git gcount
+alias gcor='command git checkout --recurse-submodules'
+
 alias gcp='command git cherry-pick'
 alias gcpa='command git cherry-pick --abort'
 alias gcpc='command git cherry-pick --continue'
 alias gcps='command git cherry-pick -s'
-alias gcs='command git commit -S'
+
+alias gcl='command git clone --recursive'
+function gccd() {
+  command git clone --recurse-submodules "$@"
+  local lastarg=$_
+  [[ -d $lastarg ]] && cd "$lastarg" && return
+  lastarg=${lastarg##*/}
+  cd "${lastarg%.git}"
+}
+#compdef _git gccd=git-clone
+
+alias gclean='command git clean -fd'
+
+alias gc!='command git commit --verbose --amend'
+alias gc='command git commit --verbose'
+alias gca!='command git commit --verbose --all --amend'
+alias gca='command git commit --verbose --all'
+alias gcam='command git commit --all --message'
+alias gcan!='command git commit --verbose --all --no-edit --amend'
+alias gcans!='command git commit --verbose --all --signoff --no-edit --amend'
+alias gcas='command git commit --all --signoff'
+alias gcasm='command git commit --all --signoff --message'
+alias gcmsg='command git commit --message'
+alias gcn!='command git commit --verbose --no-edit --amend'
+alias gcs='command git commit --gpg-sign'
+alias gcsm='command git commit --signoff --message'
+alias gcss='command git commit --gpg-sign --signoff'
+alias gcssm='command git commit --gpg-sign --signoff --message'
+
+alias gcf='command git config --list'
+
+alias gdct='command git describe --tags `git rev-list --tags --max-count=1`'
 
 alias gd='command git diff'
 alias gdca='command git diff --cached'
-alias gdct='command git describe --tags `git rev-list --tags --max-count=1`'
-alias gdt='command git diff-tree --no-commit-id --name-only -r'
+alias gdcw='command git diff --cached --word-diff'
+alias gds='command git diff --staged'
 alias gdw='command git diff --word-diff'
-alias gdtool='command git difftool -d'
-
+alias gdup='command git diff @{upstream}'
+function gdnolock() {
+  command git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
+}
+#compdef _git gdnolock=git-diff
 function gdv {
   command git diff -w "$@" | view -
 }
 #compdef _git gdv=git-diff
 
+alias gdt='command git diff-tree --no-commit-id --name-only -r'
+
+alias gdtool='command git difftool -d'
+
 alias gf='command git fetch'
 alias gfa='command git fetch --all --prune'
 alias gfo='command git fetch origin'
-
-function gfg {
-  command git ls-files | grep "$@"
-}
-#compdef _grep gfg
+# jobs=<n> was added in git 2.8
+# alias gfa='git fetch --all --prune --jobs=10' \
 
 alias gg='command git gui citool'
 alias gga='command git gui citool --amend'
 
-function ggf {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  command git push --force origin "${b:=$1}"
+alias ghh='command git help'
+
+alias glg='command git log --stat'
+alias glgg='command git log --graph'
+alias glgga='command git log --graph --decorate --all'
+alias glgm='command git log --graph --max-count=10'
+alias glgp='command git log --stat -p'
+alias glo='command git log --oneline --decorate'
+alias glod='command git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"'
+alias glods='command git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short'
+alias glog='command git log --oneline --decorate --graph'
+alias gloga='command git log --oneline --decorate --graph --all'
+alias glol='command git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
+alias glola='command git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all'
+alias glols='command git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat'
+# Pretty log messages
+function _git_log_prettily(){
+  if [[ $1 ]]; then
+    command git log --pretty="$1"
+  fi
 }
-#compdef _git ggf=git-checkout
+alias glp='_git_log_prettily'
+#compdef _git glp=git-log
+
+alias gignored='command git ls-files -v | grep "^[[:lower:]]"'
+alias gfg='command git ls-files | grep'
+
+alias gm='command git merge'
+alias gma='command git merge --abort'
+alias gmom='command git merge "origin/$(git_main_branch)"'
+alias gms='command git merge --squash'
+alias gmum='command git merge "upstream/$(git_main_branch)"'
+
+alias gmt='command git mergetool --no-prompt' # deprecate?
+alias gmtvim='command git mergetool --no-prompt --tool=vimdiff' # deprecate?
+alias gmtl='command git mergetool --no-prompt'
+alias gmtlvim='command git mergetool --no-prompt --tool=vimdiff'
 
+alias ggpull='command git pull origin "$(git_current_branch)"'
+alias ggpur='ggu'
+alias gl='command git pull'
+alias gluc='command git pull upstream "$(git_current_branch)"'
+alias glum='command git pull upstream "$(git_main_branch)"'
+alias gpr='command git pull --rebase'
+alias gup='command git pull --rebase'
+alias gupa='command git pull --rebase --autostash'
+alias gupav='command git pull --rebase --autostash --verbose'
+alias gupom='command git pull --rebase origin "$(git_main_branch)"'
+alias gupomi='command git pull --rebase=interactive origin "$(git_main_branch)"'
+alias gupv='command git pull --rebase --verbose'
 function ggl {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    command git pull origin "${*}"
+  if (($# != 0 && $# != 1)); then
+    command git pull origin "$*"
   else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
-    command git pull origin "${b:=$1}"
+    local b=
+    (($# == 0)) && b=$(git_current_branch)
+    command git pull origin "${b:-$1}"
   fi
 }
+function ggu {
+  local b=
+  (($# != 1)) && b=$(git_current_branch)
+  command git pull --rebase origin "${b:-$1}"
+}
 #compdef _git ggl=git-checkout
+#compdef _git ggpull=git-checkout
+#compdef _git ggpur=git-checkout
+#compdef _git ggu=git-checkout
 
+alias ggpush='command git push origin "$(git_current_branch)"'
+alias gp='command git push'
+alias gpd='command git push --dry-run'
+alias gpf!='command git push --force'
+alias gpf='command git push --force-with-lease'
+alias gpoat='command git push origin --all && command git push origin --tags'
+alias gpod='command git push origin --delete'
+alias gpsup='command git push --set-upstream origin "$(git_current_branch)"'
+alias gpsupf='command git push --set-upstream origin "$(git_current_branch)" --force-with-lease'
+alias gpu='command git push upstream'
+alias gpv='command git push --verbose'
+#is-at-least 2.30 "$git_version" && alias gpf='git push --force-with-lease --force-if-includes'
+#is-at-least 2.30 "$git_version" && alias gpsupf='git push --set-upstream origin "$(git_current_branch)" --force-with-lease --force-if-includes'
+function ggf {
+  (($# != 1)) && local b=$(git_current_branch)
+  command git push --force origin "${b:=$1}"
+}
+function ggfl {
+  (($# != 1)) && local b=$(git_current_branch)
+  command git push --force-with-lease origin "${b:=$1}"
+}
 function ggp {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    command git push origin "${*}"
+  if (($# != 0 && $# != 1)); then
+    command git push origin "$*"
   else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
+    (($# == 0)) && local b=$(git_current_branch)
     command git push origin "${b:=$1}"
   fi
 }
-#compdef _git ggp=git-checkout
-
 function ggpnp {
-  if [[ "$#" == 0 ]]; then
+  if (($# == 0)); then
     ggl && ggp
   else
-    ggl "${*}" && ggp "${*}"
+    ggl "$*" && ggp "$*"
   fi
 }
+#compdef _git ggf=git-checkout
+#compdef _git ggfl=git-checkout
+#compdef _git ggp=git-checkout
 #compdef _git ggpnp=git-checkout
-
-function ggu {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  command git pull --rebase origin "${b:=$1}"
-}
-#compdef _git ggu=git-checkout
-
-alias ggpur='ggu'
-#compdef _git ggpur=git-checkout
-
-alias ggpull='command git pull origin $(git_current_branch)'
-#compdef _git ggpull=git-checkout
-
-alias ggpush='command git push origin $(git_current_branch)'
 #compdef _git ggpush=git-checkout
-
-alias ggsup='command git branch --set-upstream-to=origin/$(git_current_branch)'
-alias gpsup='command git push --set-upstream origin $(git_current_branch)'
-
-alias ghh='command git help'
-
-alias gignore='command git update-index --assume-unchanged'
-alias gignored='command git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='command git svn dcommit && git push github master:svntrunk'
-#compdef _git git-svn-dcommit-push=git
-
-alias gk='\gitk --all --branches'
-#compdef _git gk='command gitk'
-alias gke='\gitk --all $(git log -g --pretty=%h)'
-#compdef _git gke='command gitk'
-
-alias gl='command git pull'
-alias glg='command git log --stat'
-alias glgp='command git log --stat -p'
-alias glgg='command git log --graph'
-alias glgga='command git log --graph --decorate --all'
-alias glgm='command git log --graph --max-count=10'
-alias glo='command git log --oneline --decorate'
-alias glol="command git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
-alias glola="command git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
-alias glog='command git log --oneline --decorate --graph'
-alias gloga='command git log --oneline --decorate --graph --all'
-alias glp="_git_log_prettily"
-#compdef _git glp=git-log
-
-alias gm='command git merge'
-alias gmom='command git merge origin/master'
-alias gmt='command git mergetool --no-prompt'
-alias gmtvim='command git mergetool --no-prompt --tool=vimdiff'
-alias gmum='command git merge upstream/master'
-
-alias gp='command git push'
-alias gpd='command git push --dry-run'
-alias gpoat='command git push origin --all && git push origin --tags'
 #compdef _git gpoat=git-push
-alias gpu='command git push upstream'
-alias gpv='command git push -v'
 
-alias gr='command git remote'
-alias gra='command git remote add'
 alias grb='command git rebase'
 alias grba='command git rebase --abort'
 alias grbc='command git rebase --continue'
-alias grbi='command git rebase -i'
-alias grbm='command git rebase master'
+alias grbi='command git rebase --interactive'
+alias grbo='command git rebase --onto'
 alias grbs='command git rebase --skip'
-alias grh='command git reset HEAD'
-alias grhh='command git reset HEAD --hard'
+alias grbd='command git rebase "$(git_develop_branch)"'
+alias grbm='command git rebase "$(git_main_branch)"'
+alias grbom='command git rebase "origin/$(git_main_branch)"'
+
+alias gr='command git remote'
+alias gra='command git remote add'
 alias grmv='command git remote rename'
 alias grrm='command git remote remove'
 alias grset='command git remote set-url'
+alias grup='command git remote update'
+alias grv='command git remote --verbose'
+
+alias gpristine='command git reset --hard && command git clean --force -dfx'
+alias grh='command git reset'
+alias grhh='command git reset --hard'
+alias grhk='command git reset --keep'
+alias grhs='command git reset --soft'
+alias groh='command git reset "origin/$(git_current_branch)" --hard'
 alias grt='cd $(command git rev-parse --show-toplevel || echo ".")'
 alias gru='command git reset --'
-alias grup='command git remote update'
-alias grv='command git remote -v'
 
-alias gsb='command git status -sb'
-alias gsd='command git svn dcommit'
-alias gsi='command git submodule init'
+alias grs='command git restore'
+alias grss='command git restore --source'
+alias grst='command git restore --staged'
+
+alias gunwip='command git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && command git reset HEAD~1'
+alias grev='command git revert'
+
+alias grm='command git rm'
+alias grmc='command git rm --cached'
+
+alias gcount='command git shortlog --summary --numbered'
+#compdef _git gcount complete -F _git gcount
+
+alias gsh='command git show'
 alias gsps='command git show --pretty=short --show-signature'
-alias gsr='command git svn rebase'
-alias gss='command git status -s'
-alias gst='command git status'
+
 alias gsta='command git stash save'
 alias gstaa='command git stash apply'
+alias gstall='command git stash --all'
 alias gstc='command git stash clear'
 alias gstd='command git stash drop'
 alias gstl='command git stash list'
 alias gstp='command git stash pop'
-alias gsts='command git stash show --text'
+alias gsts='command git stash show'
+alias gstu='gsta --include-untracked'
+#is-at-least 2.13 "$git_version" && alias gsta='command git stash push'
+
+alias gsb='command git status --short --branch'
+alias gss='command git status --short'
+alias gst='command git status'
+
+alias gsi='command git submodule init'
 alias gsu='command git submodule update'
 
-alias gts='command git tag -s'
+alias git-svn-dcommit-push='command git svn dcommit && command git push github "$(git_main_branch):svntrunk"'
+alias gsd='command git svn dcommit'
+alias gsr='command git svn rebase'
+#compdef _git git-svn-dcommit-push=git
+
+alias gsw='command git switch'
+alias gswc='command git switch --create'
+alias gswd='command git switch "$(git_develop_branch)"'
+alias gswm='command git switch "$(git_main_branch)"'
+
+alias gta='command git tag --annotate'
+alias gts='command git tag --sign'
 alias gtv='command git tag | sort -V'
+function gtl {
+  command git tag --sort=-v:refname -n --list "$1*"
+}
+#compdef _git gtl=git-tag
 
+alias gignore='command git update-index --assume-unchanged'
 alias gunignore='command git update-index --no-assume-unchanged'
-alias gunwip='command git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-alias gup='command git pull --rebase'
-alias gupv='command git pull --rebase -v'
-alias gupa='command git pull --rebase --autostash'
-alias gupav='command git pull --rebase --autostash -v'
-alias glum='command git pull upstream master'
 
 alias gwch='command git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='command git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
 
-alias gwt='git worktree'
-alias gwta='git worktree add'
-alias gwtls='git worktree list'
-alias gwtmv='git worktree move'
-alias gwtrm='git worktree remove'
+alias gwt='command git worktree'
+alias gwta='command git worktree add'
+alias gwtls='command git worktree list'
+alias gwtmv='command git worktree move'
+alias gwtrm='command git worktree remove'
+
+alias gk='\gitk --all --branches'
+alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h)'
+# alias gk='\gitk --all --branches &!'
+# alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
+#compdef _git gk='command gitk'
+#compdef _git gke='command gitk'