dotfile update

2 files changed, 0 insertions, 580 deletions

diff --git a/zsh/oh-my-zsh/plugins/git/README.md b/zsh/oh-my-zsh/plugins/git/README.md
deleted file mode 100644
index b9af348..0000000
--- a/zsh/oh-my-zsh/plugins/git/README.md
+++ /dev/null
@@ -1,245 +0,0 @@
-# git plugin
-
-The git plugin provides many [aliases](#aliases) and a few useful [functions](#functions).
-
-To use it, add `git` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... git)
-```
-
-## Aliases
-
-| Alias                | Command                                                                                                                          |
-|:---------------------|:---------------------------------------------------------------------------------------------------------------------------------|
-| g                    | git                                                                                                                              |
-| ga                   | git add                                                                                                                          |
-| gaa                  | git add --all                                                                                                                    |
-| gapa                 | git add --patch                                                                                                                  |
-| gau                  | git add --update                                                                                                                 |
-| gav                  | git add --verbose                                                                                                                |
-| gap                  | git apply                                                                                                                        |
-| gapt                 | git apply --3way                                                                                                                 |
-| gb                   | git branch                                                                                                                       |
-| gba                  | git branch -a                                                                                                                    |
-| gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| grep -vE "^([+*]\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| xargs git branch -d 2>/dev/null |
-| gbD                  | git branch -D                                                                                                                    |
-| gbl                  | git blame -b -w                                                                                                                  |
-| gbnm                 | git branch --no-merged                                                                                                           |
-| gbr                  | git branch --remote                                                                                                              |
-| gbs                  | git bisect                                                                                                                       |
-| gbsb                 | git bisect bad                                                                                                                   |
-| gbsg                 | git bisect good                                                                                                                  |
-| gbsr                 | git bisect reset                                                                                                                 |
-| gbss                 | git bisect start                                                                                                                 |
-| gc                   | git commit -v                                                                                                                    |
-| gc!                  | git commit -v --amend                                                                                                            |
-| gcn!                 | git commit -v --no-edit --amend                                                                                                  |
-| gca                  | git commit -v -a                                                                                                                 |
-| gca!                 | git commit -v -a --amend                                                                                                         |
-| gcan!                | git commit -v -a --no-edit --amend                                                                                               |
-| gcans!               | git commit -v -a -s --no-edit --amend                                                                                            |
-| gcam                 | git commit -a -m                                                                                                                 |
-| gcas                 | git commit -a -s                                                                                                                 |
-| gcasm                | git commit -a -s -m                                                                                                                  |
-| gcsm                 | git commit -s -m                                                                                                                 |
-| gcb                  | git checkout -b                                                                                                                  |
-| gcf                  | git config --list                                                                                                                |
-| gcl                  | git clone --recurse-submodules                                                                                                   |
-| gccd                 | git clone --recurse-submodules "$@" && cd "$(basename $_ .git)"                                                                  |
-| gclean               | git clean -id                                                                                                                    |
-| gpristine            | git reset --hard && git clean -dffx                                                                                              |
-| gcm                  | git checkout $(git_main_branch)                                                                                                  |
-| gcd                  | git checkout $(git_develop_branch)                                                                                               |
-| gcmsg                | git commit -m                                                                                                                    |
-| gco                  | git checkout                                                                                                                     |
-| gcor                 | git checkout --recurse-submodules                                                                                                |
-| gcount               | git shortlog -sn                                                                                                                 |
-| gcp                  | git cherry-pick                                                                                                                  |
-| gcpa                 | git cherry-pick --abort                                                                                                          |
-| gcpc                 | git cherry-pick --continue                                                                                                       |
-| gcs                  | git commit -S                                                                                                                    |
-| gd                   | git diff                                                                                                                         |
-| gdca                 | git diff --cached                                                                                                                |
-| gdcw                 | git diff --cached --word-diff                                                                                                    |
-| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                         |
-| gds                  | git diff --staged                                                                                                                |
-| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
-| gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)*.lock"                                                                 |
-| gdup                 | git diff @{upstream}                                                                                                             |
-| gdv                  | git diff -w $@ \| view -                                                                                                         |
-| gdw                  | git diff --word-diff                                                                                                             |
-| gf                   | git fetch                                                                                                                        |
-| gfa                  | git fetch --all --prune                                                                                                          |
-| gfg                  | git ls-files \| grep                                                                                                             |
-| gfo                  | git fetch origin                                                                                                                 |
-| gg                   | git gui citool                                                                                                                   |
-| gga                  | git gui citool --amend                                                                                                           |
-| ggf                  | git push --force origin $(current_branch)                                                                                        |
-| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                             |
-| ggl                  | git pull origin $(current_branch)                                                                                                |
-| ggp                  | git push origin $(current_branch)                                                                                                |
-| ggpnp                | ggl && ggp                                                                                                                       |
-| ggpull               | git pull origin "$(git_current_branch)"                                                                                          |
-| ggpur                | ggu                                                                                                                              |
-| ggpush               | git push origin "$(git_current_branch)"                                                                                          |
-| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                        |
-| ggu                  | git pull --rebase origin $(current_branch)                                                                                       |
-| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                             |
-| ghh                  | git help                                                                                                                         |
-| gignore              | git update-index --assume-unchanged                                                                                              |
-| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
-| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
-| gk                   | gitk --all --branches &!                                                                                                          |
-| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                           |
-| gl                   | git pull                                                                                                                         |
-| glg                  | git log --stat                                                                                                                   |
-| glgp                 | git log --stat -p                                                                                                                |
-| glgg                 | git log --graph                                                                                                                  |
-| glgga                | git log --graph --decorate --all                                                                                                 |
-| glgm                 | git log --graph --max-count=10                                                                                                   |
-| glo                  | git log --oneline --decorate                                                                                                     |
-| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'                           |
-| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat                    |
-| glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                           |
-| glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short              |
-| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all                     |
-| glog                 | git log --oneline --decorate --graph                                                                                             |
-| gloga                | git log --oneline --decorate --graph --all                                                                                       |
-| glp                  | git log --pretty=\<format\>                                                                                                      |
-| gm                   | git merge                                                                                                                        |
-| gmom                 | git merge origin/$(git_main_branch)                                                                                              |
-| gmtl                 | git mergetool --no-prompt                                                                                                        |
-| gmtlvim              | git mergetool --no-prompt --tool=vimdiff                                                                                         |
-| gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
-| gma                  | git merge --abort                                                                                                                |
-| gp                   | git push                                                                                                                         |
-| gpd                  | git push --dry-run                                                                                                               |
-| gpf                  | git push --force-with-lease                                                                                                      |
-| gpf!                 | git push --force                                                                                                                 |
-| gpoat                | git push origin --all && git push origin --tags                                                                                  |
-| gpr                  | git pull --rebase                                                                                                                |
-| gpu                  | git push upstream                                                                                                                |
-| gpv                  | git push -v                                                                                                                      |
-| gr                   | git remote                                                                                                                       |
-| gra                  | git remote add                                                                                                                   |
-| grb                  | git rebase                                                                                                                       |
-| grba                 | git rebase --abort                                                                                                               |
-| grbc                 | git rebase --continue                                                                                                            |
-| grbd                 | git rebase $(git_develop_branch)                                                                                                 |
-| grbi                 | git rebase -i                                                                                                                    |
-| grbm                 | git rebase $(git_main_branch)                                                                                                    |
-| grbom                | git rebase origin/$(git_main_branch)                                                                                             |
-| grbo                 | git rebase --onto                                                                                                                |
-| grbs                 | git rebase --skip                                                                                                                |
-| grev                 | git revert                                                                                                                       |
-| grh                  | git reset                                                                                                                        |
-| grhh                 | git reset --hard                                                                                                                 |
-| groh                 | git reset origin/$(git_current_branch) --hard                                                                                    |
-| grm                  | git rm                                                                                                                           |
-| grmc                 | git rm --cached                                                                                                                  |
-| grmv                 | git remote rename                                                                                                                |
-| grrm                 | git remote remove                                                                                                                |
-| grs                  | git restore                                                                                                                      |
-| grset                | git remote set-url                                                                                                               |
-| grss                 | git restore --source                                                                                                             |
-| grst                 | git restore --staged                                                                                                             |
-| grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                                |
-| gru                  | git reset --                                                                                                                     |
-| grup                 | git remote update                                                                                                                |
-| grv                  | git remote -v                                                                                                                    |
-| gsb                  | git status -sb                                                                                                                   |
-| gsd                  | git svn dcommit                                                                                                                  |
-| gsh                  | git show                                                                                                                         |
-| gsi                  | git submodule init                                                                                                               |
-| gsps                 | git show --pretty=short --show-signature                                                                                         |
-| gsr                  | git svn rebase                                                                                                                   |
-| gss                  | git status -s                                                                                                                    |
-| gst                  | git status                                                                                                                       |
-| gsta                 | git stash push                                                                                                                   |
-| gsta                 | git stash save                                                                                                                   |
-| gstaa                | git stash apply                                                                                                                  |
-| gstc                 | git stash clear                                                                                                                  |
-| gstd                 | git stash drop                                                                                                                   |
-| gstl                 | git stash list                                                                                                                   |
-| gstp                 | git stash pop                                                                                                                    |
-| gsts                 | git stash show --text                                                                                                            |
-| gstu                 | git stash --include-untracked                                                                                                    |
-| gstall               | git stash --all                                                                                                                  |
-| gsu                  | git submodule update                                                                                                             |
-| gsw                  | git switch                                                                                                                       |
-| gswc                 | git switch -c                                                                                                                    |
-| gswm                 | git switch $(git_main_branch)                                                                                                    |
-| gswd                 | git switch $(git_develop_branch)                                                                                                 |
-| gts                  | git tag -s                                                                                                                       |
-| gtv                  | git tag \| sort -V                                                                                                               |
-| gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                       |
-| gunignore            | git update-index --no-assume-unchanged                                                                                           |
-| gunwip               | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1                                                                     |
-| gup                  | git pull --rebase                                                                                                                |
-| gupv                 | git pull --rebase -v                                                                                                             |
-| gupa                 | git pull --rebase --autostash                                                                                                    |
-| gupav                | git pull --rebase --autostash -v                                                                                                 |
-| glum                 | git pull upstream $(git_main_branch)                                                                                             |
-| gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
-| gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
-| gam                  | git am                                                                                                                           |
-| gamc                 | git am --continue                                                                                                                |
-| gams                 | git am --skip                                                                                                                    |
-| gama                 | git am --abort                                                                                                                   |
-| gamscp               | git am --show-current-patch                                                                                                      |
-
-### Main branch preference
-
-Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
-a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
-that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
-function `git_main_branch`.
-
-### Deprecated aliases
-
-These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
-
-| Alias  | Command                                                | Modification                                           |
-| :----- | :----------------------------------------------------- | :----------------------------------------------------- |
-| gap    | `git add --patch`                                      | new alias `gapa`                                       |
-| gcl    | `git config --list`                                    | new alias `gcf`                                        |
-| gdc    | `git diff --cached`                                    | new alias `gdca`                                       |
-| gdt    | `git difftool`                                         | no replacement                                         |
-| ggpull | `git pull origin $(current_branch)`                    | new alias `ggl` (`ggpull` still exists for now though) |
-| ggpur  | `git pull --rebase origin $(current_branch)`           | new alias `ggu` (`ggpur` still exists for now though)  |
-| ggpush | `git push origin $(current_branch)`                    | new alias `ggp` (`ggpush` still exists for now though) |
-| gk     | `gitk --all --branches`                                | now aliased to `gitk --all --branches`                 |
-| glg    | `git log --stat --max-count = 10`                      | now aliased to `git log --stat --color`                |
-| glgg   | `git log --graph --max-count = 10`                     | now aliased to `git log --graph --color`               |
-| gwc    | `git whatchanged -p --abbrev-commit --pretty = medium` | new alias `gwch`                                       |
-
-## Functions
-
-### Current
-
-| Command                | Description                                                                                              |
-|:-----------------------|:---------------------------------------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                                                 |
-| current_branch         | Return the name of the current branch                                                                    |
-| git_current_user_name  | Returns the `user.name` config value                                                                     |
-| git_current_user_email | Returns the `user.email` config value                                                                    |
-| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise                             |
-| git_develop_branch     | Returns the name of the develop branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
-
-### Work in Progress (WIP)
-
-These features allow to pause a branch development and switch to another one (_"Work in Progress"_,  or wip). When you want to go back to work, just unwip it.
-
-| Command          | Description                                     |
-|:-----------------|:------------------------------------------------|
-| work_in_progress | Echoes a warning if the current branch is a wip |
-| gwip             | Commit wip branch                               |
-| gunwip           | Uncommit wip branch                             |
-
-### Deprecated functions
-
-| Command                | Description                             | Reason                                                          |
-|:-----------------------|:----------------------------------------|:----------------------------------------------------------------|
-| current_repository     | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
diff --git a/zsh/oh-my-zsh/plugins/git/git.plugin.zsh b/zsh/oh-my-zsh/plugins/git/git.plugin.zsh
deleted file mode 100644
index 8f7e623..0000000
--- a/zsh/oh-my-zsh/plugins/git/git.plugin.zsh
+++ /dev/null
@@ -1,335 +0,0 @@
-# Git version checking
-autoload -Uz is-at-least
-git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
-
-#
-# Functions
-#
-
-# The name of the current branch
-# Back-compatibility wrapper for when this function was defined here in
-# the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
-# to fix the core -> git plugin dependency.
-function current_branch() {
-  git_current_branch
-}
-
-# Pretty log messages
-function _git_log_prettily(){
-  if ! [ -z $1 ]; then
-    git log --pretty=$1
-  fi
-}
-compdef _git _git_log_prettily=git-log
-
-# Warn if the current branch is a WIP
-function work_in_progress() {
-  command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
-}
-
-# 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}; do
-    if command git show-ref -q --verify $ref; then
-      echo ${ref:t}
-      return
-    fi
-  done
-  echo master
-}
-
-# 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
-}
-
-#
-# Aliases
-# (sorted alphabetically)
-#
-
-alias g='git'
-
-alias ga='git add'
-alias gaa='git add --all'
-alias gapa='git add --patch'
-alias gau='git add --update'
-alias gav='git add --verbose'
-alias gap='git apply'
-alias gapt='git apply --3way'
-
-alias gb='git branch'
-alias gba='git branch -a'
-alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
-alias gbD='git branch -D'
-alias gbl='git blame -b -w'
-alias gbnm='git branch --no-merged'
-alias gbr='git branch --remote'
-alias gbs='git bisect'
-alias gbsb='git bisect bad'
-alias gbsg='git bisect good'
-alias gbsr='git bisect reset'
-alias gbss='git bisect start'
-
-alias gc='git commit -v'
-alias gc!='git commit -v --amend'
-alias gcn!='git commit -v --no-edit --amend'
-alias gca='git commit -v -a'
-alias gca!='git commit -v -a --amend'
-alias gcan!='git commit -v -a --no-edit --amend'
-alias gcans!='git commit -v -a -s --no-edit --amend'
-alias gcam='git commit -a -m'
-alias gcsm='git commit -s -m'
-alias gcas='git commit -a -s'
-alias gcasm='git commit -a -s -m'
-alias gcb='git checkout -b'
-alias gcf='git config --list'
-
-function gccd() {
-  command git clone --recurse-submodules "$@"
-  [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
-}
-compdef _git gccd=git-clone
-
-alias gcl='git clone --recurse-submodules'
-alias gclean='git clean -id'
-alias gpristine='git reset --hard && git clean -dffx'
-alias gcm='git checkout $(git_main_branch)'
-alias gcd='git checkout $(git_develop_branch)'
-alias gcmsg='git commit -m'
-alias gco='git checkout'
-alias gcor='git checkout --recurse-submodules'
-alias gcount='git shortlog -sn'
-alias gcp='git cherry-pick'
-alias gcpa='git cherry-pick --abort'
-alias gcpc='git cherry-pick --continue'
-alias gcs='git commit -S'
-alias gcss='git commit -S -s'
-alias gcssm='git commit -S -s -m'
-
-alias gd='git diff'
-alias gdca='git diff --cached'
-alias gdcw='git diff --cached --word-diff'
-alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
-alias gds='git diff --staged'
-alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdup='git diff @{upstream}'
-alias gdw='git diff --word-diff'
-
-function gdnolock() {
-  git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
-}
-compdef _git gdnolock=git-diff
-
-function gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
-
-alias gf='git fetch'
-# --jobs=<n> was added in git 2.8
-is-at-least 2.8 "$git_version" \
-  && alias gfa='git fetch --all --prune --jobs=10' \
-  || alias gfa='git fetch --all --prune'
-alias gfo='git fetch origin'
-
-alias gfg='git ls-files | grep'
-
-alias gg='git gui citool'
-alias gga='git gui citool --amend'
-
-function ggf() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git push --force origin "${b:=$1}"
-}
-compdef _git ggf=git-checkout
-function ggfl() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git push --force-with-lease origin "${b:=$1}"
-}
-compdef _git ggfl=git-checkout
-
-function ggl() {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    git pull origin "${*}"
-  else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
-    git pull origin "${b:=$1}"
-  fi
-}
-compdef _git ggl=git-checkout
-
-function ggp() {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    git push origin "${*}"
-  else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
-    git push origin "${b:=$1}"
-  fi
-}
-compdef _git ggp=git-checkout
-
-function ggpnp() {
-  if [[ "$#" == 0 ]]; then
-    ggl && ggp
-  else
-    ggl "${*}" && ggp "${*}"
-  fi
-}
-compdef _git ggpnp=git-checkout
-
-function ggu() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git pull --rebase origin "${b:=$1}"
-}
-compdef _git ggu=git-checkout
-
-alias ggpur='ggu'
-alias ggpull='git pull origin "$(git_current_branch)"'
-alias ggpush='git push origin "$(git_current_branch)"'
-
-alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-alias gpsup='git push --set-upstream origin $(git_current_branch)'
-
-alias ghh='git help'
-
-alias gignore='git update-index --assume-unchanged'
-alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
-
-alias gk='\gitk --all --branches &!'
-alias gke='\gitk --all $(git log -g --pretty=%h) &!'
-
-alias gl='git pull'
-alias glg='git log --stat'
-alias glgp='git log --stat -p'
-alias glgg='git log --graph'
-alias glgga='git log --graph --decorate --all'
-alias glgm='git log --graph --max-count=10'
-alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
-alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
-alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
-alias glog='git log --oneline --decorate --graph'
-alias gloga='git log --oneline --decorate --graph --all'
-alias glp="_git_log_prettily"
-
-alias gm='git merge'
-alias gmom='git merge origin/$(git_main_branch)'
-alias gmtl='git mergetool --no-prompt'
-alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/$(git_main_branch)'
-alias gma='git merge --abort'
-
-alias gp='git push'
-alias gpd='git push --dry-run'
-alias gpf='git push --force-with-lease'
-alias gpf!='git push --force'
-alias gpoat='git push origin --all && git push origin --tags'
-alias gpr='git pull --rebase'
-alias gpu='git push upstream'
-alias gpv='git push -v'
-
-alias gr='git remote'
-alias gra='git remote add'
-alias grb='git rebase'
-alias grba='git rebase --abort'
-alias grbc='git rebase --continue'
-alias grbd='git rebase $(git_develop_branch)'
-alias grbi='git rebase -i'
-alias grbm='git rebase $(git_main_branch)'
-alias grbom='git rebase origin/$(git_main_branch)'
-alias grbo='git rebase --onto'
-alias grbs='git rebase --skip'
-alias grev='git revert'
-alias grh='git reset'
-alias grhh='git reset --hard'
-alias groh='git reset origin/$(git_current_branch) --hard'
-alias grm='git rm'
-alias grmc='git rm --cached'
-alias grmv='git remote rename'
-alias grrm='git remote remove'
-alias grs='git restore'
-alias grset='git remote set-url'
-alias grss='git restore --source'
-alias grst='git restore --staged'
-alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
-alias gru='git reset --'
-alias grup='git remote update'
-alias grv='git remote -v'
-
-alias gsb='git status -sb'
-alias gsd='git svn dcommit'
-alias gsh='git show'
-alias gsi='git submodule init'
-alias gsps='git show --pretty=short --show-signature'
-alias gsr='git svn rebase'
-alias gss='git status -s'
-alias gst='git status'
-
-# use the default stash push on git 2.13 and newer
-is-at-least 2.13 "$git_version" \
-  && alias gsta='git stash push' \
-  || alias gsta='git stash save'
-
-alias gstaa='git stash apply'
-alias gstc='git stash clear'
-alias gstd='git stash drop'
-alias gstl='git stash list'
-alias gstp='git stash pop'
-alias gsts='git stash show --text'
-alias gstu='gsta --include-untracked'
-alias gstall='git stash --all'
-alias gsu='git submodule update'
-alias gsw='git switch'
-alias gswc='git switch -c'
-alias gswm='git switch $(git_main_branch)'
-alias gswd='git switch $(git_develop_branch)'
-
-alias gts='git tag -s'
-alias gtv='git tag | sort -V'
-alias gtl='gtl(){ git tag --sort=-v:refname -n -l "${1}*" }; noglob gtl'
-
-alias gunignore='git update-index --no-assume-unchanged'
-alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-alias gup='git pull --rebase'
-alias gupv='git pull --rebase -v'
-alias gupa='git pull --rebase --autostash'
-alias gupav='git pull --rebase --autostash -v'
-alias glum='git pull upstream $(git_main_branch)'
-
-alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
-
-alias gam='git am'
-alias gamc='git am --continue'
-alias gams='git am --skip'
-alias gama='git am --abort'
-alias gamscp='git am --show-current-patch'
-
-function grename() {
-  if [[ -z "$1" || -z "$2" ]]; then
-    echo "Usage: $0 old_branch new_branch"
-    return 1
-  fi
-
-  # Rename branch locally
-  git branch -m "$1" "$2"
-  # Rename branch in origin remote
-  if git push origin :"$1"; then
-    git push --set-upstream origin "$2"
-  fi
-}
-
-unset git_version