This commit is contained in:
Nuri Jung 2025-12-01 22:23:24 -03:00 committed by GitHub
commit d9ab3e1a29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 212 additions and 212 deletions

View file

@ -10,217 +10,217 @@ plugins=(... git)
## Aliases ## Aliases
| Alias | Command | | Alias | Command |
| :--------------------- | :------------------------------------------------------------------------------------------------------------------------------ | | :--------------------- | :-------------------------------------------------------------------------------------------------------------------- |
| `grt` | `cd "$(git rev-parse --show-toplevel \|\| echo .)"` | | `grt` | `cd "$(git rev-parse --show-toplevel \|\| echo .)"` |
| `ggpnp` | `ggl && ggp` | | `ggpnp` | `ggl && ggp` |
| `ggpur` | `ggu` | | `ggpur` | `ggu` |
| `g` | `git` | | `g` | `git` |
| `ga` | `git add` | | `ga` | `git add` |
| `gaa` | `git add --all` | | `gaa` | `git add --all` |
| `gapa` | `git add --patch` | | `gapa` | `git add --patch` |
| `gau` | `git add --update` | | `gau` | `git add --update` |
| `gav` | `git add --verbose` | | `gav` | `git add --verbose` |
| `gwip` | `git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"` | | `gwip` | `git add -A; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"` |
| `gam` | `git am` | | `gam` | `git am` |
| `gama` | `git am --abort` | | `gama` | `git am --abort` |
| `gamc` | `git am --continue` | | `gamc` | `git am --continue` |
| `gamscp` | `git am --show-current-patch` | | `gamscp` | `git am --show-current-patch` |
| `gams` | `git am --skip` | | `gams` | `git am --skip` |
| `gap` | `git apply` | | `gap` | `git apply` |
| `gapt` | `git apply --3way` | | `gapt` | `git apply --3way` |
| `gbs` | `git bisect` | | `gbs` | `git bisect` |
| `gbsb` | `git bisect bad` | | `gbsb` | `git bisect bad` |
| `gbsg` | `git bisect good` | | `gbsg` | `git bisect good` |
| `gbsn` | `git bisect new` | | `gbsn` | `git bisect new` |
| `gbso` | `git bisect old` | | `gbso` | `git bisect old` |
| `gbsr` | `git bisect reset` | | `gbsr` | `git bisect reset` |
| `gbss` | `git bisect start` | | `gbss` | `git bisect start` |
| `gbl` | `git blame -w` | | `gbl` | `git blame -w` |
| `gb` | `git branch` | | `gb` | `git branch` |
| `gba` | `git branch --all` | | `gba` | `git branch --all` |
| `gbd` | `git branch --delete` | | `gbd` | `git branch --delete` |
| `gbD` | `git branch --delete --force` | | `gbD` | `git branch --delete --force` |
| `gbgd` | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -d` | | `gbgd` | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -d` |
| `gbgD` | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -D` | | `gbgD` | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -D` |
| `gbm` | `git branch --move` | | `gbm` | `git branch --move` |
| `gbnm` | `git branch --no-merged` | | `gbnm` | `git branch --no-merged` |
| `gbr` | `git branch --remote` | | `gbr` | `git branch --remote` |
| `ggsup` | `git branch --set-upstream-to=origin/$(git_current_branch)` | | `ggsup` | `git branch --set-upstream-to=origin/$(git_current_branch)` |
| `gbg` | `LANG=C git branch -vv \| grep ": gone\]"` | | `gbg` | `LANG=C git branch -vv \| grep ": gone\]"` |
| `gco` | `git checkout` | | `gco` | `git checkout` |
| `gcor` | `git checkout --recurse-submodules` | | `gcor` | `git checkout --recurse-submodules` |
| `gcb` | `git checkout -b` | | `gcb` | `git checkout -b` |
| `gcB` | `git checkout -B` | | `gcB` | `git checkout -B` |
| `gcd` | `git checkout $(git_develop_branch)` | | `gcd` | `git checkout $(git_develop_branch)` |
| `gcm` | `git checkout $(git_main_branch)` | | `gcm` | `git checkout $(git_main_branch)` |
| `gcp` | `git cherry-pick` | | `gcp` | `git cherry-pick` |
| `gcpa` | `git cherry-pick --abort` | | `gcpa` | `git cherry-pick --abort` |
| `gcpc` | `git cherry-pick --continue` | | `gcpc` | `git cherry-pick --continue` |
| `gclean` | `git clean --interactive -d` | | `gclean` | `git clean --interactive -d` |
| `gcl` | `git clone --recurse-submodules` | | `gcl` | `git clone --recurse-submodules` |
| `gclf` | `git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules` | | `gclf` | `git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules` |
| `gccd` | `git clone --recurse-submodules "$@" && cd "$(basename $\_ .git)"` | | `gccd` | `git clone --recurse-submodules "$@" && cd "$(basename $\_ .git)"` |
| `gcam` | `git commit --all --message` | | `gcam` | `git commit --all --message` |
| `gcas` | `git commit --all --signoff` | | `gcas` | `git commit --all --signoff` |
| `gcasm` | `git commit --all --signoff --message` | | `gcasm` | `git commit --all --signoff --message` |
| `gcmsg` | `git commit --message` | | `gcmsg` | `git commit --message` |
| `gcsm` | `git commit --signoff --message` | | `gcsm` | `git commit --signoff --message` |
| `gc` | `git commit --verbose` | | `gc` | `git commit --verbose` |
| `gca` | `git commit --verbose --all` | | `gca` | `git commit --verbose --all` |
| `gca!` | `git commit --verbose --all --amend` | | `gca!` | `git commit --verbose --all --amend` |
| `gcan!` | `git commit --verbose --all --no-edit --amend` | | `gcan!` | `git commit --verbose --all --no-edit --amend` |
| `gcans!` | `git commit --verbose --all --signoff --no-edit --amend` | | `gcans!` | `git commit --verbose --all --signoff --no-edit --amend` |
| `gcann!` | `git commit --verbose --all --date=now --no-edit --amend` | | `gcann!` | `git commit --verbose --all --date=now --no-edit --amend` |
| `gc!` | `git commit --verbose --amend` | | `gc!` | `git commit --verbose --amend` |
| `gcn` | `git commit --verbose --no-edit` | | `gcn` | `git commit --verbose --no-edit` |
| `gcn!` | `git commit --verbose --no-edit --amend` | | `gcn!` | `git commit --verbose --no-edit --amend` |
| `gcs` | `git commit -S` | | `gcs` | `git commit -S` |
| `gcss` | `git commit -S -s` | | `gcss` | `git commit -S -s` |
| `gcssm` | `git commit -S -s -m` | | `gcssm` | `git commit -S -s -m` |
| `gcf` | `git config --list` | | `gcf` | `git config --list` |
| `gcfu` | `git commit --fixup` | | `gcfu` | `git commit --fixup` |
| `gdct` | `git describe --tags $(git rev-list --tags --max-count=1)` | | `gdct` | `git describe --tags $(git rev-list --tags --max-count=1)` |
| `gd` | `git diff` | | `gd` | `git diff` |
| `gdca` | `git diff --cached` | | `gdca` | `git diff --cached` |
| `gdcw` | `git diff --cached --word-diff` | | `gdcw` | `git diff --cached --word-diff` |
| `gds` | `git diff --staged` | | `gds` | `git diff --staged` |
| `gdw` | `git diff --word-diff` | | `gdw` | `git diff --word-diff` |
| `gdv` | `git diff -w "$@" \| view -` | | `gdv` | `git diff -w "$@" \| view -` |
| `gdup` | `git diff @{upstream}` | | `gdup` | `git diff @{upstream}` |
| `gdnolock` | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"` | | `gdnolock` | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"` |
| `gdt` | `git diff-tree --no-commit-id --name-only -r` | | `gdt` | `git diff-tree --no-commit-id --name-only -r` |
| `gf` | `git fetch` | | `gf` | `git fetch` |
| `gfa` | `git fetch --all --tags --prune` | | `gfa` | `git fetch --all --tags --prune` |
| `gfo` | `git fetch origin` | | `gfo` | `git fetch origin` |
| `gg` | `git gui citool` | | `gg` | `git gui citool` |
| `gga` | `git gui citool --amend` | | `gga` | `git gui citool --amend` |
| `ghh` | `git help` | | `ghh` | `git help` |
| `glgg` | `git log --graph` | | `glgg` | `git log --graph` |
| `glgga` | `git log --graph --decorate --all` | | `glgga` | `git log --graph --decorate --all` |
| `glgm` | `git log --graph --max-count=10` | | `glgm` | `git log --graph --max-count=10` |
| `glod` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'` | | `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` | | `glods` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short` |
| `glol` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'` | | `glol` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'` |
| `glola` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all` | | `glola` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all` |
| `glols` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat` | | `glols` | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat` |
| `glo` | `git log --oneline --decorate` | | `glo` | `git log --oneline --decorate` |
| `glog` | `git log --oneline --decorate --graph` | | `glog` | `git log --oneline --decorate --graph` |
| `gloga` | `git log --oneline --decorate --graph --all` | | `gloga` | `git log --oneline --decorate --graph --all` |
| `glp` | `git log --pretty=<format>` | | `glp` | `git log --pretty=<format>` |
| `glg` | `git log --stat` | | `glg` | `git log --stat` |
| `glgp` | `git log --stat --patch` | | `glgp` | `git log --stat --patch` |
| `gignored` | `git ls-files -v \| grep "^[[:lower:]]"` | | `gignored` | `git ls-files -v \| grep "^[[:lower:]]"` |
| `gfg` | `git ls-files \| grep` | | `gfg` | `git ls-files \| grep` |
| `gm` | `git merge` | | `gm` | `git merge` |
| `gma` | `git merge --abort` | | `gma` | `git merge --abort` |
| `gmc` | `git merge --continue` | | `gmc` | `git merge --continue` |
| `gms` | `git merge --squash` | | `gms` | `git merge --squash` |
| `gmff` | `git merge --ff-only` | | `gmff` | `git merge --ff-only` |
| `gmom` | `git merge origin/$(git_main_branch)` | | `gmom` | `git merge origin/$(git_main_branch)` |
| `gmum` | `git merge upstream/$(git_main_branch)` | | `gmum` | `git merge upstream/$(git_main_branch)` |
| `gmtl` | `git mergetool --no-prompt` | | `gmtl` | `git mergetool --no-prompt` |
| `gmtlvim` | `git mergetool --no-prompt --tool=vimdiff` | | `gmtlvim` | `git mergetool --no-prompt --tool=vimdiff` |
| `gl` | `git pull` | | `gl` | `git pull` |
| `gpr` | `git pull --rebase` | | `gpr` | `git pull --rebase` |
| `gprv` | `git pull --rebase -v` | | `gprv` | `git pull --rebase -v` |
| `gpra` | `git pull --rebase --autostash` | | `gpra` | `git pull --rebase --autostash` |
| `gprav` | `git pull --rebase --autostash -v` | | `gprav` | `git pull --rebase --autostash -v` |
| `gprom` | `git pull --rebase origin $(git_main_branch)` | | `gprom` | `git pull --rebase origin $(git_main_branch)` |
| `gpromi` | `git pull --rebase=interactive origin $(git_main_branch)` | | `gpromi` | `git pull --rebase=interactive origin $(git_main_branch)` |
| `gprum` | `git pull --rebase upstream $(git_main_branch)` | | `gprum` | `git pull --rebase upstream $(git_main_branch)` |
| `gprumi` | `git pull --rebase=interactive upstream $(git_main_branch)` | | `gprumi` | `git pull --rebase=interactive upstream $(git_main_branch)` |
| `ggpull` | `git pull origin "$(git_current_branch)"` | | `ggpull` | `git pull origin "$(git_current_branch)"` |
| `ggl` | `git pull origin $(current_branch)` | | `ggl` | `git pull origin $(current_branch)` |
| `gluc` | `git pull upstream $(git_current_branch)` | | `gluc` | `git pull upstream $(git_current_branch)` |
| `glum` | `git pull upstream $(git_main_branch)` | | `glum` | `git pull upstream $(git_main_branch)` |
| `gp` | `git push` | | `gp` | `git push` |
| `gpd` | `git push --dry-run` | | `gpd` | `git push --dry-run` |
| `gpf!` | `git push --force` | | `gpf!` | `git push --force` |
| `ggf` | `git push --force origin $(current_branch)` | | `ggf` | `git push --force origin $(current_branch)` |
| `gpf` | On Git >= 2.30: `git push --force-with-lease --force-if-includes` | | `gpf` | On Git >= 2.30: `git push --force-with-lease --force-if-includes` |
| `gpf` | On Git < 2.30: `git push --force-with-lease` | | `gpf` | On Git < 2.30: `git push --force-with-lease` |
| `ggfl` | `git push --force-with-lease origin $(current_branch)` | | `ggfl` | `git push --force-with-lease origin $(current_branch)` |
| `gpsup` | `git push --set-upstream origin $(git_current_branch)` | | `gpsup` | `git push --set-upstream origin $(git_current_branch)` |
| `gpsupf` | On Git >= 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes` | | `gpsupf` | On Git >= 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes` |
| `gpsupf` | On Git < 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease` | | `gpsupf` | On Git < 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease` |
| `gpv` | `git push --verbose` | | `gpv` | `git push --verbose` |
| `gpoat` | `git push origin --all && git push origin --tags` | | `gpoat` | `git push origin --all && git push origin --tags` |
| `gpod` | `git push origin --delete` | | `gpod` | `git push origin --delete` |
| `ggpush` | `git push origin "$(git_current_branch)"` | | `ggpush` | `git push origin "$(git_current_branch)"` |
| `ggp` | `git push origin $(current_branch)` | | `ggp` | `git push origin $(current_branch)` |
| `gpu` | `git push upstream` | | `gpu` | `git push upstream` |
| `grb` | `git rebase` | | `grb` | `git rebase` |
| `grba` | `git rebase --abort` | | `grba` | `git rebase --abort` |
| `grbc` | `git rebase --continue` | | `grbc` | `git rebase --continue` |
| `grbi` | `git rebase --interactive` | | `grbi` | `git rebase --interactive` |
| `grbo` | `git rebase --onto` | | `grbo` | `git rebase --onto` |
| `grbs` | `git rebase --skip` | | `grbs` | `git rebase --skip` |
| `grbd` | `git rebase $(git_develop_branch)` | | `grbd` | `git rebase $(git_develop_branch)` |
| `grbm` | `git rebase $(git_main_branch)` | | `grbm` | `git rebase $(git_main_branch)` |
| `grbom` | `git rebase origin/$(git_main_branch)` | | `grbom` | `git rebase origin/$(git_main_branch)` |
| `grbum` | `git rebase upstream/$(git_main_branch)` | | `grbum` | `git rebase upstream/$(git_main_branch)` |
| `grf` | `git reflog` | | `grf` | `git reflog` |
| `gr` | `git remote` | | `gr` | `git remote` |
| `grv` | `git remote --verbose` | | `grv` | `git remote --verbose` |
| `gra` | `git remote add` | | `gra` | `git remote add` |
| `grrm` | `git remote remove` | | `grrm` | `git remote remove` |
| `grmv` | `git remote rename` | | `grmv` | `git remote rename` |
| `grset` | `git remote set-url` | | `grset` | `git remote set-url` |
| `grup` | `git remote update` | | `grup` | `git remote update` |
| `grh` | `git reset` | | `grh` | `git reset` |
| `gru` | `git reset --` | | `gru` | `git reset --` |
| `grhh` | `git reset --hard` | | `grhh` | `git reset --hard` |
| `grhk` | `git reset --keep` | | `grhk` | `git reset --keep` |
| `grhs` | `git reset --soft` | | `grhs` | `git reset --soft` |
| `gpristine` | `git reset --hard && git clean --force -dfx` | | `gpristine` | `git reset --hard && git clean --force -dfx` |
| `gwipe` | `git reset --hard && git clean --force -df` | | `gwipe` | `git reset --hard && git clean --force -df` |
| `groh` | `git reset origin/$(git_current_branch) --hard` | | `groh` | `git reset origin/$(git_current_branch) --hard` |
| `grs` | `git restore` | | `grs` | `git restore` |
| `grss` | `git restore --source` | | `grss` | `git restore --source` |
| `grst` | `git restore --staged` | | `grst` | `git restore --staged` |
| `gunwip` | `git rev-list --max-count=1 --format="%s" HEAD \| grep -q "--wip--" && git reset HEAD~1` | | `gunwip` | `git rev-list --max-count=1 --format="%s" HEAD \| grep -q "--wip--" && git reset HEAD~1` |
| `grev` | `git revert` | | `grev` | `git revert` |
| `grm` | `git rm` | | `grm` | `git rm` |
| `grmc` | `git rm --cached` | | `grmc` | `git rm --cached` |
| `gcount` | `git shortlog --summary -n` | | `gcount` | `git shortlog --summary -n` |
| `gsh` | `git show` | | `gsh` | `git show` |
| `gsps` | `git show --pretty=short --show-signature` | | `gsps` | `git show --pretty=short --show-signature` |
| `gstall` | `git stash --all` | | `gstall` | `git stash --all` |
| `gstu` | `git stash --include-untracked` | | `gstu` | `git stash --include-untracked` |
| `gstaa` | `git stash apply` | | `gstaa` | `git stash apply` |
| `gstc` | `git stash clear` | | `gstc` | `git stash clear` |
| `gstd` | `git stash drop` | | `gstd` | `git stash drop` |
| `gstl` | `git stash list` | | `gstl` | `git stash list` |
| `gstp` | `git stash pop` | | `gstp` | `git stash pop` |
| `gsta` | On Git >= 2.13: `git stash push` | | `gsta` | On Git >= 2.13: `git stash push` |
| `gsta` | On Git < 2.13: `git stash save` | | `gsta` | On Git < 2.13: `git stash save` |
| `gsts` | `git stash show --patch` | | `gsts` | `git stash show --patch` |
| `gst` | `git status` | | `gst` | `git status` |
| `gss` | `git status --short` | | `gss` | `git status --short` |
| `gsb` | `git status --short -b` | | `gsb` | `git status --short -b` |
| `gsi` | `git submodule init` | | `gsi` | `git submodule init` |
| `gsu` | `git submodule update` | | `gsu` | `git submodule update` |
| `gsd` | `git svn dcommit` | | `gsd` | `git svn dcommit` |
| `git-svn-dcommit-push` | `git svn dcommit && git push github $(git_main_branch):svntrunk` | | `git-svn-dcommit-push` | `git svn dcommit && git push github $(git_main_branch):svntrunk` |
| `gsr` | `git svn rebase` | | `gsr` | `git svn rebase` |
| `gsw` | `git switch` | | `gsw` | `git switch` |
| `gswc` | `git switch -c` | | `gswc` | `git switch -c` |
| `gswd` | `git switch $(git_develop_branch)` | | `gswd` | `git switch $(git_develop_branch)` |
| `gswm` | `git switch $(git_main_branch)` | | `gswm` | `git switch $(git_main_branch)` |
| `gta` | `git tag --annotate` | | `gta` | `git tag --annotate` |
| `gts` | `git tag -s` | | `gts` | `git tag -s` |
| `gtv` | `git tag \| sort -V` | | `gtv` | `git tag \| sort -V` |
| `gignore` | `git update-index --assume-unchanged` | | `gignore` | `git update-index --assume-unchanged` |
| `gunignore` | `git update-index --no-assume-unchanged` | | `gunignore` | `git update-index --no-assume-unchanged` |
| `gwch` | `git log --patch --abbrev-commit --pretty=medium --raw` | | `gwch` | `git log --patch --abbrev-commit --pretty=medium --raw` |
| `gwt` | `git worktree` | | `gwt` | `git worktree` |
| `gwtls` | `git worktree list` | | `gwtls` | `git worktree list` |
| `gwtmv` | `git worktree move` | | `gwtmv` | `git worktree move` |
| `gwtrm` | `git worktree remove` | | `gwtrm` | `git worktree remove` |
| `gk` | `gitk --all --branches &!` | | `gk` | `gitk --all --branches &!` |
| `gke` | `gitk --all $(git log --walk-reflogs --pretty=%h) &!` | | `gke` | `gitk --all $(git log --walk-reflogs --pretty=%h) &!` |
| `gtl` | `gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl` | | `gtl` | `gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl` |
### Main branch preference ### Main branch preference

View file

@ -117,7 +117,7 @@ alias gaa='git add --all'
alias gapa='git add --patch' alias gapa='git add --patch'
alias gau='git add --update' alias gau='git add --update'
alias gav='git add --verbose' alias gav='git add --verbose'
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"' alias gwip='git add -A; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
alias gam='git am' alias gam='git am'
alias gama='git am --abort' alias gama='git am --abort'
alias gamc='git am --continue' alias gamc='git am --continue'