git completions installed

.config/fish/conf.d/git_abbr.fish

@@ -0,0 +1,438 @@
+#!/usr/bin/env fish
+#
+# git-abbr: git abbreviations for the fish shell
+#
+# Copyright (c) 2022 Rich Lewis
+# MIT License
+
+set -g __git_abbr_version 0.2.1
+
+abbr g 'git'
+
+abbr ga 'git add'
+abbr gaa 'git add --all'
+abbr gapa 'git add --patch'
+abbr gau 'git add --update'
+abbr gav 'git add --verbose'
+abbr gap 'git apply'
+abbr gapt 'git apply --3way'
+
+abbr gb 'git branch'
+abbr gba 'git branch -a'
+abbr gbd 'git branch -d'
+abbr gbdf 'git branch -d -f'
+abbr gbD 'git branch -D'
+abbr gbDf 'git branch -D -f'
+abbr gbnm 'git branch --no-merged'
+abbr gbr 'git branch --remote'
+
+abbr gbl 'git blame -b -w'
+
+abbr gbs 'git bisect'
+abbr gbsb 'git bisect bad'
+abbr gbsg 'git bisect good'
+abbr gbsr 'git bisect reset'
+abbr gbss 'git bisect start'
+
+abbr gc 'git commit -v'
+abbr gci 'git commit --allow-empty -v -m\'chore: initial commit\''
+abbr gc! 'git commit -v --amend'
+abbr gcn 'git commit -v --no-edit'
+abbr gcn! 'git commit -v --amend --no-edit'
+abbr gca 'git commit -a -v'
+abbr gca! 'git commit -a -v --amend'
+abbr gcan! 'git commit -a -v --no-edit --amend'
+abbr gcans! 'git commit -a -v -s --no-edit --amend'
+abbr gcam 'git commit -a -m'
+abbr gcas 'git commit -a -s'
+abbr gcasm 'git commit -a -s -m'
+abbr gcsm 'git commit -s -m'
+abbr gcm 'git commit -m'
+abbr gcs 'git commit -S'
+
+abbr gcf 'git config --list'
+
+abbr gcl 'git clone --recurse-submodules'
+
+abbr gclean 'git clean -id'
+
+abbr gco 'git checkout'
+abbr gcob 'git checkout -b'
+abbr gcom 'git checkout (git_main_branch)'
+abbr gcod 'git checkout (git_develop_branch)'
+abbr gcof 'git checkout (git_feature_prepend)/'
+abbr gcoh 'git checkout hotfix/'
+abbr gcor 'git checkout release/'
+abbr gcos 'git checkout support/'
+abbr gcors 'git checkout --recurse-submodules'
+
+abbr gcount 'git shortlog -sn'
+
+abbr gcp 'git cherry-pick'
+abbr gcpa 'git cherry-pick --abort'
+abbr gcpc 'git cherry-pick --continue'
+
+abbr gd 'git diff'
+abbr gdca 'git diff --cached'
+abbr gdcw 'git diff --cached --word-diff'
+abbr gdct 'git diff --staged'
+abbr gdt 'git diff-tree --no-commit-id --name-only -r'
+# abbr gdnolock 'git diff ":(exclude)package-lock.json" ":(exclude)*.lock"'
+abbr gdup 'git diff @{upstream}'
+# abbr gdv 'git diff -w $@ | view -'
+
+abbr gdct 'git describe --tags (git rev-list --tags --max-count=1)'
+
+abbr gf 'git fetch'
+abbr gfa 'git fetch --all --prune'
+abbr gfo 'git fetch origin'
+
+# gg
+# gga
+# ggf
+# ggfl
+# ggl
+# ggp
+# ggpnp
+# ggpull
+# ggpur
+# ggpush
+# ggsup
+# ggu
+# gpsup
+
+abbr ghh 'git help'
+
+abbr gi 'git init'
+
+abbr gignore 'git update-index --assume-unchanged'
+abbr gignored 'git ls-files -v | grep "^[[:lower:]]"'
+
+abbr gk 'gitk --all --branches &!'
+abbr gke 'gitk --all (git log -g --pretty=%h) &!'
+
+abbr gfg 'git ls-files | grep'
+
+# gl: git log
+abbr gl 'git log'
+abbr gls 'git log --stat'
+abbr glsp 'git log --stat -p'
+abbr glg 'git log --graph'
+abbr glgda 'git log --graph --decorate --all'
+abbr glgm 'git log --graph --max-count=10'
+abbr glo 'git log --oneline --decorate'
+abbr glog 'git log --oneline --decorate --graph'
+abbr gloga 'git log --oneline --decorate --graph --all'
+# abbr glol
+# abbr glols
+# abbr glod
+# abbr glods
+# abbr glola
+
+# gm: git merge
+abbr gm 'git merge'
+abbr gmom 'git merge origin/(git_main_branch)'
+abbr gmum 'git merge upstream/(git_main_branch)'
+abbr gma 'git merge --abort'
+
+# gmtl: git mergetool
+abbr gmtl 'git mergetool --no-prompt'
+abbr gmtlvim 'git mergetool --no-prompt --tool=vimdiff'
+
+# gp: git push
+abbr gp 'git push'
+abbr gpd 'git push --dry-run'
+abbr gpf 'git push --force-with-lease'
+abbr gpf! 'git push --force'
+abbr gpsu 'git push --set-upstream origin (git_current_branch)'
+abbr gpt 'git push --tags'
+abbr gptf 'git push --tags --force-with-lease'
+abbr gptf! 'git push --tags --force'
+abbr gpoat 'git push origin --all && git push origin --tags'
+abbr gpoatf! 'git push origin --all --force-with-lease && git push origin --tags --force-with-lease'
+abbr gpoatf! 'git push origin --all --force && git push origin --tags --force'
+abbr gpv 'git push -v'
+
+# gpl: git pull
+abbr gpl 'git pull'
+abbr gplo 'git pull origin'
+abbr gplom 'git pull origin (git_main_branch)'
+abbr gplu 'git pull upstream'
+abbr gplum 'git pull upstream (git_main_branch)'
+
+# gr: git remote
+abbr gr 'git remote -v'
+abbr gra 'git remote add'
+abbr grau 'git remote add upstream'
+abbr grrm 'git remote remove'
+abbr grmv 'git remote rename'
+abbr grset 'git remote set-url'
+abbr gru 'git remote update'
+abbr grv 'git remote -v'
+abbr grvv 'git remote -vvv'
+
+# grb: git rebase
+abbr grb 'git rebase'
+abbr grba 'git rebase --abort'
+abbr grbc 'git rebase --continue'
+abbr grbd 'git rebase (git_develop_branch)'
+abbr grbi 'git rebase -i'
+abbr grbom 'git rebase origin/(git_main_branch)'
+abbr grbo 'git rebase --onto'
+abbr grbs 'git rebase --skip'
+
+# grev: git revert
+abbr grev 'git revert'
+
+# grs: git reset
+abbr grs 'git reset'
+abbr grs! 'git reset --hard'
+abbr grsh 'git reset HEAD'
+abbr grsh! 'git reset HEAD --hard'
+abbr grsoh 'git reset origin/(git_current_branch)'
+abbr grsoh! 'git reset origin/(git_current_branch) --hard'
+abbr gpristine 'git reset --hard && git clean -dffx'
+abbr grs- 'git reset --'
+
+# grm: git rm
+abbr grm 'git rm'
+abbr grmc 'git rm --cached'
+
+# grst: git restore
+abbr grst 'git restore'
+abbr grsts 'git restore --source'
+abbr grstst 'git restore --staged'
+
+# grt: git return
+abbr grt 'cd (git rev-parse --show-toplevel || echo .)'
+
+# gs: git status
+abbr gs 'git status'
+abbr gss 'git status -s'
+abbr gsb 'git status -sb'
+
+# gshow: git show
+abbr gshow 'git show'
+abbr gshowps 'git show --pretty=short --show-signature'
+
+# gst: git stash
+abbr gst 'git stash'
+abbr gsta 'git stash apply'
+abbr gstc 'git stash clear'
+abbr gstd 'git stash drop'
+abbr gstl 'git stash list'
+abbr gstp 'git stash pop'
+abbr gstshow 'git stash show --text'
+abbr gstall 'git stash --all'
+abbr gsts 'git stash save'
+
+# gsu: git submodule
+abbr gsu 'git submodule update'
+
+# gsw: git switch
+abbr gsw 'git switch'
+abbr gswc 'git switch -c'
+abbr gswm 'git switch (git_main_branch)'
+abbr gswd 'git switch (git_develop_branch)'
+
+# gt: git tag
+abbr gt 'git tag'
+abbr gts 'git tag -s'
+abbr gta 'git tag -a'
+abbr gtas 'git tag -a -s'
+# gtl
+
+# gwch: git whatchanged
+abbr gwch 'git whatchanged -p --abbrev-commit --pretty=medium'
+
+# gwt: git worktree
+abbr gwt 'git worktree'
+abbr gwta 'git worktree add'
+abbr gwtls 'git worktree list'
+abbr gwtmv 'git worktree move'
+abbr gwtrm 'git worktree remove'
+
+# gam: git am
+abbr gam 'git am'
+abbr gamc 'git am --continue'
+abbr gams 'git am --skip'
+abbr gama 'git am --abort'
+abbr gamscp 'git am --show-current-patch'
+
+function git_abbr_uninstall --on-event git_abbr_uninstall
+
+  set -e __git_abbr_version
+
+  functions -e git_current_branch
+  functions -e git_main_branch
+  functions -e git_develop_branch
+  functions -e git_feature_branch_prepend
+
+  abbr -e g
+  abbr -e ga
+  abbr -e gaa
+  abbr -e gapa
+  abbr -e gau
+  abbr -e gav
+  abbr -e gap
+  abbr -e gapt
+  abbr -e gb
+  abbr -e gba
+  abbr -e gbd
+  abbr -e gbDf
+  abbr -e gbD
+  abbr -e gbDf
+  abbr -e gbnm
+  abbr -e gbr
+  abbr -e gbl
+  abbr -e gbs
+  abbr -e gbsb
+  abbr -e gbsg
+  abbr -e gbsr
+  abbr -e gbss
+  abbr -e gc
+  abbr -e gci
+  abbr -e gc!
+  abbr -e gcn
+  abbr -e gcn!
+  abbr -e gca
+  abbr -e gca!
+  abbr -e gcan!
+  abbr -e gcans!
+  abbr -e gcam
+  abbr -e gcas
+  abbr -e gcasm
+  abbr -e gcsm
+  abbr -e gcm
+  abbr -e gcs
+  abbr -e gcf
+  abbr -e gcl
+  abbr -e gclean
+  abbr -e gco
+  abbr -e gcob
+  abbr -e gcom
+  abbr -e gcod
+  abbr -e gcof
+  abbr -e gcoh
+  abbr -e gcor
+  abbr -e gcos
+  abbr -e gcors
+  abbr -e gcount
+  abbr -e gcp
+  abbr -e gcpa
+  abbr -e gcpc
+  abbr -e gd
+  abbr -e gdca
+  abbr -e gdcw
+  abbr -e gdct
+  abbr -e gdt
+  abbr -e gdup
+  abbr -e gdct
+  abbr -e gf
+  abbr -e gfa
+  abbr -e gfo
+  abbr -e ghh
+  abbr -e gi
+  abbr -e gignore
+  abbr -e gignored
+  abbr -e gk
+  abbr -e gke
+  abbr -e gfg
+  abbr -e gl
+  abbr -e gls
+  abbr -e glsp
+  abbr -e glg
+  abbr -e glgda
+  abbr -e glgm
+  abbr -e glo
+  abbr -e glog
+  abbr -e gloga
+  abbr -e gm
+  abbr -e gmom
+  abbr -e gmum
+  abbr -e gma
+  abbr -e gmtl
+  abbr -e gmtlvim
+  abbr -e gp
+  abbr -e gpd
+  abbr -e gpf
+  abbr -e gpf!
+  abbr -e gpt
+  abbr -e gptf
+  abbr -e gptf!
+  abbr -e gpoat
+  abbr -e gpoatf!
+  abbr -e gpoatf!
+  abbr -e gpv
+  abbr -e gpl
+  abbr -e gplo
+  abbr -e gplom
+  abbr -e gplu
+  abbr -e gplum
+  abbr -e gr
+  abbr -e gra
+  abbr -e grau
+  abbr -e grrm
+  abbr -e grmv
+  abbr -e grset
+  abbr -e gru
+  abbr -e grv
+  abbr -e grvv
+  abbr -e grb
+  abbr -e grba
+  abbr -e grbc
+  abbr -e grbd
+  abbr -e grbi
+  abbr -e grbom
+  abbr -e grbo
+  abbr -e grbs
+  abbr -e grev
+  abbr -e grs
+  abbr -e grs!
+  abbr -e grsh
+  abbr -e grsh!
+  abbr -e grsoh
+  abbr -e grsoh!
+  abbr -e gpristine
+  abbr -e grs-
+  abbr -e grm
+  abbr -e grmc
+  abbr -e grst
+  abbr -e grsts
+  abbr -e grstst
+  abbr -e grt
+  abbr -e gs
+  abbr -e gss
+  abbr -e gsb
+  abbr -e gshow
+  abbr -e gshowps
+  abbr -e gst
+  abbr -e gsta
+  abbr -e gstc
+  abbr -e gstd
+  abbr -e gstl
+  abbr -e gstp
+  abbr -e gstshow
+  abbr -e gstall
+  abbr -e gsts
+  abbr -e gsu
+  abbr -e gsw
+  abbr -e gswc
+  abbr -e gswm
+  abbr -e gswd
+  abbr -e gt
+  abbr -e gts
+  abbr -e gta
+  abbr -e gtas
+  abbr -e gwch
+  abbr -e gwt
+  abbr -e gwta
+  abbr -e gwtls
+  abbr -e gwtmv
+  abbr -e gwtrm
+  abbr -e gam
+  abbr -e gamc
+  abbr -e gams
+  abbr -e gama
+  abbr -e gamscp
+end

.config/fish/fish_plugins

@@ -1,2 +1,3 @@
 jorgebucaran/fisher
 ilancosman/tide@v6
+lewisacidic/fish-git-abbr

.config/fish/fish_variables

@@ -4,7 +4,8 @@ SETUVAR VIRTUAL_ENV_DISABLE_PROMPT:true
 SETUVAR __fish_initialized:3400
 SETUVAR _fisher_ilancosman_2F_tide_40_v6_files:\x7e/\x2econfig/fish/functions/_tide_1_line_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_2_line_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_cache_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_detect_os\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_find_and_remove\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_fish_colorize\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_aws\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_character\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_cmd_duration\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_context\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_crystal\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_direnv\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_distrobox\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_docker\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_elixir\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_gcloud\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_git\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_go\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_java\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_jobs\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_kubectl\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_nix_shell\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_node\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_os\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_php\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_private_mode\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_pulumi\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_python\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_ruby\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_rustc\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_shlvl\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_terraform\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_time\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_toolbox\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_vi_mode\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_zig\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_parent_dirs\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_print_item\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_pwd\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_remove_unusable_items\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_bug\x2dreport\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_configure\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_reload\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_mode_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/tide\x1e\x7e/\x2econfig/fish/functions/tide\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/_tide_init\x2efish\x1e\x7e/\x2econfig/fish/completions/tide\x2efish
 SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish
-SETUVAR _fisher_plugins:jorgebucaran/fisher\x1eilancosman/tide\x40v6
+SETUVAR _fisher_lewisacidic_2F_fish_2D_git_2D_abbr_files:\x7e/\x2econfig/fish/functions/git_current_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/git_develop_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/git_feature_branch_prepend\x2efish\x1e\x7e/\x2econfig/fish/functions/git_main_branch\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/git_abbr\x2efish
+SETUVAR _fisher_plugins:jorgebucaran/fisher\x1eilancosman/tide\x40v6\x1elewisacidic/fish\x2dgit\x2dabbr
 SETUVAR _fisher_upgraded_to_4_4:\x1d
 SETUVAR _tide_left_items:os\x1epwd\x1egit\x1enewline\x1echaracter
 SETUVAR _tide_prompt_566242:\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\uf312\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x40PWD\x40\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\uf1d3\x20\x1b\x5b37m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0mmain\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x20\x211\x1b\x5b38\x3b2\x3b0\x3b175\x3b255m\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\x20\x1e\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\u276f\x1e\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b0\x3b175\x3b175m\U000f0320\x203\x2e13\x2e0\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\x20\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m22\x3a08\x3a46\x1b\x5bm\x0f\x1b\x5bm\x0f\x1b\x5bm\x0f

.config/fish/functions/git_current_branch.fish

@@ -0,0 +1,3 @@
+function git_current_branch -d 'Detect name of current branch of current git repository'
+  echo (git branch --show-current)
+end

.config/fish/functions/git_develop_branch.fish

@@ -0,0 +1,10 @@
+function git_develop_branch -d 'Detect name of develop branch of current git repository'
+  command git rev-parse --git-dir &>/dev/null || return
+  for branch in dev devel development
+    if command git show-ref -q --verify refs/heads/$branch
+      echo $branch
+      return
+    end
+  end
+  echo develop
+end

.config/fish/functions/git_feature_branch_prepend.fish

@@ -0,0 +1,9 @@
+function git_feature_branch_prepend -d 'Detect prepend of feature branches of git repository'
+  command git rev-parse --git-dir &>/dev/null || return
+  if string match -q '*/feat/*' (git show-ref)
+    echo feat
+    return
+  end
+  echo feature
+end
+

.config/fish/functions/git_main_branch.fish

@@ -0,0 +1,11 @@
+function git_main_branch -d 'Detect name of main branch of current git repository'
+  # heuristic to return the name of the main branch
+  command git rev-parse --git-dir &> /dev/null || return
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,master,trunk}
+    if command git show-ref -q --verify $ref
+      echo (string split -r -m1 -f2 / $ref)
+      return
+    end
+  end
+  echo main
+end