mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-15 01:48:34 -07:00
refactor(git): sort git aliases alphabetically (#9743)
This commit is contained in:
Miguel Hargreaves Pimenta
GitHub
parent
3f477e5da5
commit
33c0de7add
@ -10,213 +10,214 @@ plugins=(... git)
|
|||||||
|
|
||||||
## Aliases
|
## Aliases
|
||||||
|
|
||||||
| Alias | Command |
|
| Alias | Command |
|
||||||
| :------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
| :------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| g | git |
|
| grt | cd "$(git rev-parse --show-toplevel || echo .)" |
|
||||||
| ga | git add |
|
| ggpnp | ggl && ggp |
|
||||||
| gaa | git add --all |
|
| ggpur | ggu |
|
||||||
| gapa | git add --patch |
|
| g | git |
|
||||||
| gau | git add --update |
|
| ga | git add |
|
||||||
| gav | git add --verbose |
|
| gaa | git add --all |
|
||||||
| gap | git apply |
|
| gapa | git add --patch |
|
||||||
| gapt | git apply --3way |
|
| gau | git add --update |
|
||||||
| gb | git branch |
|
| gav | git add --verbose |
|
||||||
| gba | git branch --all |
|
| gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]" |
|
||||||
| gbd | git branch --delete |
|
| gam | git am |
|
||||||
| gbda | git branch --no-color --merged \| grep -vE "^([+*]\|\s*(<span>$</span>(git_main_branch)\|<span>$</span>(git_develop_branch))\s*<span>$</span>)" \| xargs git branch --delete 2>/dev/null |
|
| gama | git am --abort |
|
||||||
| gbD | git branch --delete --force |
|
| gamc | git am --continue |
|
||||||
| gbg | git branch -vv | grep ": gone\]" |
|
| gamscp | git am --show-current-patch |
|
||||||
| gbgd | git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d |
|
| gams | git am --skip |
|
||||||
| gbgD | git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D |
|
| gap | git apply |
|
||||||
| gbl | git blame -b -w |
|
| gapt | git apply --3way |
|
||||||
| gbnm | git branch --no-merged |
|
| gbs | git bisect |
|
||||||
| gbr | git branch --remote |
|
| gbsb | git bisect bad |
|
||||||
| gbs | git bisect |
|
| gbsg | git bisect good |
|
||||||
| gbsb | git bisect bad |
|
| gbsr | git bisect reset |
|
||||||
| gbsg | git bisect good |
|
| gbss | git bisect start |
|
||||||
| gbsr | git bisect reset |
|
| gbl | git blame -b -w |
|
||||||
| gbss | git bisect start |
|
| gb | git branch |
|
||||||
| gc | git commit --verbose |
|
| gba | git branch --all |
|
||||||
| gc! | git commit --verbose --amend |
|
| gbd | git branch --delete |
|
||||||
| gcn! | git commit --verbose --no-edit --amend |
|
| gbD | git branch --delete --force |
|
||||||
| gca | git commit --verbose --all |
|
| gbda | git branch --no-color --merged | grep -vE "^([+]|\s($(git_main_branch)|$(git_develop_branch))\s\*$)" | xargs git branch --delete 2>/dev/null |
|
||||||
| gca! | git commit --verbose --all --amend |
|
| gbgd | git branch --no-color -vv |
|
||||||
| gcan! | git commit --verbose --all --no-edit --amend |
|
| gbgD | git branch --no-color -vv |
|
||||||
| gcans! | git commit --verbose --all --signoff --no-edit --amend |
|
| gbnm | git branch --no-merged |
|
||||||
| gcam | git commit --all --message |
|
| gbr | git branch --remote |
|
||||||
| gcas | git commit --all --signoff |
|
| ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
|
||||||
| gcasm | git commit --all --signoff --message |
|
| gbg | git branch -vv |
|
||||||
| gcsm | git commit --signoff --message |
|
| gco | git checkout |
|
||||||
| gcb | git checkout -b |
|
| gcor | git checkout --recurse-submodules |
|
||||||
| gcf | git config --list |
|
| gcb | git checkout -b |
|
||||||
| gcl | git clone --recurse-submodules |
|
| gcd | git checkout $(git_develop_branch) |
|
||||||
| gccd | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>\_ .git)" |
|
| gcm | git checkout $(git_main_branch) |
|
||||||
| gclean | git clean --interactive -d |
|
| gcp | git cherry-pick |
|
||||||
| gpristine | git reset --hard && git clean -dffx |
|
| gcpa | git cherry-pick --abort |
|
||||||
| gcm | git checkout $(git_main_branch) |
|
| gcpc | git cherry-pick --continue |
|
||||||
| gcd | git checkout $(git_develop_branch) |
|
| gclean | git clean --interactive -d |
|
||||||
| gcmsg | git commit --message |
|
| gcl | git clone --recurse-submodules |
|
||||||
| gco | git checkout |
|
| gccd | git clone --recurse-submodules "$@" && cd "$(basename $\_ .git)" |
|
||||||
| gcor | git checkout --recurse-submodules |
|
| gcam | git commit --all --message |
|
||||||
| gcount | git shortlog --summary -n |
|
| gcas | git commit --all --signoff |
|
||||||
| gcp | git cherry-pick |
|
| gcasm | git commit --all --signoff --message |
|
||||||
| gcpa | git cherry-pick --abort |
|
| gcmsg | git commit --message |
|
||||||
| gcpc | git cherry-pick --continue |
|
| gcsm | git commit --signoff --message |
|
||||||
| gcs | git commit -S |
|
| gc | git commit --verbose |
|
||||||
| gcss | git commit -S -s |
|
| gca | git commit --verbose --all |
|
||||||
| gcssm | git commit -S -s -m |
|
| gca! | git commit --verbose --all --amend |
|
||||||
| gd | git diff |
|
| gcan! | git commit --verbose --all --no-edit --amend |
|
||||||
| gdca | git diff --cached |
|
| gcans! | git commit --verbose --all --signoff --no-edit --amend |
|
||||||
| gdcw | git diff --cached --word-diff |
|
| gc! | git commit --verbose --amend |
|
||||||
| gdct | git describe --tags $(git rev-list --tags --max-count=1) |
|
| gcn! | git commit --verbose --no-edit --amend |
|
||||||
| gds | git diff --staged |
|
| gcs | git commit -S |
|
||||||
| gdt | git diff-tree --no-commit-id --name-only -r |
|
| gcss | git commit -S -s |
|
||||||
| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock" |
|
| gcssm | git commit -S -s -m |
|
||||||
| gdup | git diff @{upstream} |
|
| gcf | git config --list |
|
||||||
| gdv | git diff -w $@ \| view - |
|
| gdct | git describe --tags $(git rev-list --tags --max-count=1) |
|
||||||
| gdw | git diff --word-diff |
|
| gd | git diff |
|
||||||
| gf | git fetch |
|
| gdca | git diff --cached |
|
||||||
| gfa | git fetch --all --prune |
|
| gdcw | git diff --cached --word-diff |
|
||||||
| gfg | git ls-files \| grep |
|
| gds | git diff --staged |
|
||||||
| gfo | git fetch origin |
|
| gdw | git diff --word-diff |
|
||||||
| gg | git gui citool |
|
| gdv | git diff -w $@ | view - |
|
||||||
| gga | git gui citool --amend |
|
| gdup | git diff @{upstream} |
|
||||||
| ggf | git push --force origin $(current_branch) |
|
| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock" |
|
||||||
| ggfl | git push --force-with-lease origin $(current_branch) |
|
| gdt | git diff-tree --no-commit-id --name-only -r |
|
||||||
| ggl | git pull origin $(current_branch) |
|
| gf | git fetch |
|
||||||
| ggp | git push origin $(current_branch) |
|
| gfa | git fetch --all --prune |
|
||||||
| ggpnp | ggl && ggp |
|
| gfo | git fetch origin |
|
||||||
| ggpull | git pull origin "$(git_current_branch)" |
|
| gg | git gui citool |
|
||||||
| ggpur | ggu |
|
| gga | git gui citool --amend |
|
||||||
| ggpush | git push origin "$(git_current_branch)" |
|
| ghh | git help |
|
||||||
| ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
|
| glgg | git log --graph |
|
||||||
| ggu | git pull --rebase origin $(current_branch) |
|
| glgga | git log --graph --decorate --all |
|
||||||
| gpsup | git push --set-upstream origin $(git_current_branch) |
|
| glgm | git log --graph --max-count=10 |
|
||||||
| gpsupf | git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes (git version >= 2.30) |
|
| glod | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' |
|
||||||
| gpsupf | git push --set-upstream origin $(git_current_branch) --force-with-lease (git version < 2.30) |
|
| glods | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short |
|
||||||
| ghh | git help |
|
| glol | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' |
|
||||||
| gignore | git update-index --assume-unchanged |
|
| glola | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all |
|
||||||
| gignored | git ls-files -v \| grep "^[[:lower:]]" |
|
| glols | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat |
|
||||||
| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk |
|
| glo | git log --oneline --decorate |
|
||||||
| gk | gitk --all --branches &! |
|
| glog | git log --oneline --decorate --graph |
|
||||||
| gke | gitk --all $(git log --walk-reflogs --pretty=%h) &! |
|
| gloga | git log --oneline --decorate --graph --all |
|
||||||
| gl | git pull |
|
| glp | git log --pretty=\<format> |
|
||||||
| glg | git log --stat |
|
| glg | git log --stat |
|
||||||
| glgp | git log --stat --patch |
|
| glgp | git log --stat --patch |
|
||||||
| glgg | git log --graph |
|
| gignored | git ls-files -v | grep "^[[:lower:]]" |
|
||||||
| glgga | git log --graph --decorate --all |
|
| gfg | git ls-files | grep |
|
||||||
| glgm | git log --graph --max-count=10 |
|
| gm | git merge |
|
||||||
| glo | git log --oneline --decorate |
|
| gma | git merge --abort |
|
||||||
| glol | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' |
|
| gms | git merge --squash |
|
||||||
| glols | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat |
|
| gmom | git merge origin/$(git_main_branch) |
|
||||||
| glod | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' |
|
| gmum | git merge upstream/$(git_main_branch) |
|
||||||
| glods | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short |
|
| gmtl | git mergetool --no-prompt |
|
||||||
| glola | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all |
|
| gmtlvim | git mergetool --no-prompt --tool=vimdiff |
|
||||||
| glog | git log --oneline --decorate --graph |
|
| gl | git pull |
|
||||||
| gloga | git log --oneline --decorate --graph --all |
|
| gpr | git pull --rebase |
|
||||||
| glp | git log --pretty=\<format\> |
|
| gup | git pull --rebase |
|
||||||
| gm | git merge |
|
| gupa | git pull --rebase --autostash |
|
||||||
| gms | git merge --squash |
|
| gupav | git pull --rebase --autostash --verbose |
|
||||||
| gmom | git merge origin/$(git_main_branch) |
|
| gupv | git pull --rebase --verbose |
|
||||||
| gmtl | git mergetool --no-prompt |
|
| ggu | git pull --rebase origin $(current_branch) |
|
||||||
| gmtlvim | git mergetool --no-prompt --tool=vimdiff |
|
| gupom | git pull --rebase origin $(git_main_branch) |
|
||||||
| gmum | git merge upstream/$(git_main_branch) |
|
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
||||||
| gma | git merge --abort |
|
| ggpull | git pull origin "$(git_current_branch)" |
|
||||||
| gp | git push |
|
| ggl | git pull origin $(current_branch) |
|
||||||
| gpd | git push --dry-run |
|
| gluc | git pull upstream $(git_current_branch) |
|
||||||
| gpf | git push --force-with-lease --force-if-includes (git version >= 2.30) |
|
| glum | git pull upstream $(git_main_branch) |
|
||||||
| gpf | git push --force-with-lease (git version < 2.30) |
|
| gp | git push |
|
||||||
| gpf! | git push --force |
|
| gpd | git push --dry-run |
|
||||||
| gpoat | git push origin --all && git push origin --tags |
|
| gpf! | git push --force |
|
||||||
| gpod | git push origin --delete |
|
| ggf | git push --force origin $(current_branch) |
|
||||||
| gpr | git pull --rebase |
|
| gpf | git push --force-with-lease --force-if-includes (git version >= 2.30) |
|
||||||
| gpu | git push upstream |
|
| gpf | git push --force-with-lease (git version < 2.30) |
|
||||||
| gpv | git push --verbose |
|
| ggfl | git push --force-with-lease origin $(current_branch) |
|
||||||
| gr | git remote |
|
| gpsup | git push --set-upstream origin $(git_current_branch) |
|
||||||
| gra | git remote add |
|
| gpsupf | git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes (git version >= 2.30) |
|
||||||
| grb | git rebase |
|
| gpsupf | git push --set-upstream origin $(git_current_branch) --force-with-lease (git version < 2.30) |
|
||||||
| grba | git rebase --abort |
|
| gpv | git push --verbose |
|
||||||
| grbc | git rebase --continue |
|
| gpoat | git push origin --all && git push origin --tags |
|
||||||
| grbd | git rebase $(git_develop_branch) |
|
| gpod | git push origin --delete |
|
||||||
| grbi | git rebase --interactive |
|
| ggpush | git push origin "$(git_current_branch)" |
|
||||||
| grbm | git rebase $(git_main_branch) |
|
| ggp | git push origin $(current_branch) |
|
||||||
| grbom | git rebase origin/$(git_main_branch) |
|
| gpu | git push upstream |
|
||||||
| grbo | git rebase --onto |
|
| grb | git rebase |
|
||||||
| grbs | git rebase --skip |
|
| grba | git rebase --abort |
|
||||||
| grev | git revert |
|
| grbc | git rebase --continue |
|
||||||
| grh | git reset |
|
| grbi | git rebase --interactive |
|
||||||
| grhh | git reset --hard |
|
| grbo | git rebase --onto |
|
||||||
| groh | git reset origin/$(git_current_branch) --hard |
|
| grbs | git rebase --skip |
|
||||||
| grm | git rm |
|
| grbd | git rebase $(git_develop_branch) |
|
||||||
| grmc | git rm --cached |
|
| grbm | git rebase $(git_main_branch) |
|
||||||
| grmv | git remote rename |
|
| grbom | git rebase origin/$(git_main_branch) |
|
||||||
| grrm | git remote remove |
|
| gr | git remote |
|
||||||
| grs | git restore |
|
| grv | git remote --verbose |
|
||||||
| grset | git remote set-url |
|
| gra | git remote add |
|
||||||
| grss | git restore --source |
|
| grrm | git remote remove |
|
||||||
| grst | git restore --staged |
|
| grmv | git remote rename |
|
||||||
| grt | cd "$(git rev-parse --show-toplevel \|\| echo .)" |
|
| grset | git remote set-url |
|
||||||
| gru | git reset -- |
|
| grup | git remote update |
|
||||||
| grup | git remote update |
|
| grh | git reset |
|
||||||
| grv | git remote --verbose |
|
| gru | git reset -- |
|
||||||
| gsb | git status --short -b |
|
| grhh | git reset --hard |
|
||||||
| gsd | git svn dcommit |
|
| gpristine | git reset --hard && git clean -dffx |
|
||||||
| gsh | git show |
|
| groh | git reset origin/$(git_current_branch) --hard |
|
||||||
| gsi | git submodule init |
|
| grs | git restore |
|
||||||
| gsps | git show --pretty=short --show-signature |
|
| grss | git restore --source |
|
||||||
| gsr | git svn rebase |
|
| grst | git restore --staged |
|
||||||
| gss | git status --short |
|
| gunwip | git rev-list --max-count=1 --format="%s" HEAD | grep -q "--wip--" && git reset HEAD~1 |
|
||||||
| gst | git status |
|
| grev | git revert |
|
||||||
| gsta | git stash push (git version >= 2.13) |
|
| grm | git rm |
|
||||||
| gsta | git stash save (git version < 2.13) |
|
| grmc | git rm --cached |
|
||||||
| gstaa | git stash apply |
|
| gcount | git shortlog --summary -n |
|
||||||
| gstc | git stash clear |
|
| gsh | git show |
|
||||||
| gstd | git stash drop |
|
| gsps | git show --pretty=short --show-signature |
|
||||||
| gstl | git stash list |
|
| gstall | git stash --all |
|
||||||
| gstp | git stash pop |
|
| gstu | git stash --include-untracked |
|
||||||
| gsts | git stash show --text |
|
| gstaa | git stash apply |
|
||||||
| gstu | git stash --include-untracked |
|
| gstc | git stash clear |
|
||||||
| gstall | git stash --all |
|
| gstd | git stash drop |
|
||||||
| gsu | git submodule update |
|
| gstl | git stash list |
|
||||||
| gsw | git switch |
|
| gstp | git stash pop |
|
||||||
| gswc | git switch -c |
|
| gsta | git stash push (git version >= 2.13) |
|
||||||
| gswm | git switch $(git_main_branch) |
|
| gsta | git stash save (git version < 2.13) |
|
||||||
| gswd | git switch $(git_develop_branch) |
|
| gsts | git stash show --text |
|
||||||
| gts | git tag -s |
|
| gst | git status |
|
||||||
| gtv | git tag \| sort -V |
|
| gss | git status --short |
|
||||||
| gtl | gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl |
|
| gsb | git status --short -b |
|
||||||
| gunignore | git update-index --no-assume-unchanged |
|
| gsi | git submodule init |
|
||||||
| gunwip | git rev-list --max-count=1 --format="%s" HEAD \| grep -q "\-\-wip\-\-" && git reset HEAD~1 |
|
| gsu | git submodule update |
|
||||||
| gup | git pull --rebase |
|
| gsd | git svn dcommit |
|
||||||
| gupv | git pull --rebase --verbose |
|
| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk |
|
||||||
| gupa | git pull --rebase --autostash |
|
| gsr | git svn rebase |
|
||||||
| gupav | git pull --rebase --autostash --verbose |
|
| gsw | git switch |
|
||||||
| gupom | git pull --rebase origin $(git_main_branch) |
|
| gswc | git switch -c |
|
||||||
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
| gswd | git switch $(git_develop_branch) |
|
||||||
| glum | git pull upstream $(git_main_branch) |
|
| gswm | git switch $(git_main_branch) |
|
||||||
| gluc | git pull upstream $(git_current_branch) |
|
| gts | git tag -s |
|
||||||
| gwch | git whatchanged -p --abbrev-commit --pretty=medium |
|
| gtv | git tag | sort -V |
|
||||||
| gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]" |
|
| gignore | git update-index --assume-unchanged |
|
||||||
| gam | git am |
|
| gunignore | git update-index --no-assume-unchanged |
|
||||||
| gamc | git am --continue |
|
| gwch | git whatchanged -p --abbrev-commit --pretty=medium |
|
||||||
| gams | git am --skip |
|
| gwt | git worktree |
|
||||||
| gama | git am --abort |
|
| gwtls | git worktree list |
|
||||||
| gamscp | git am --show-current-patch |
|
| gwtmv | git worktree move |
|
||||||
| gwt | git worktree |
|
| gwtrm | git worktree remove |
|
||||||
| gwtls | git worktree list |
|
| gk | gitk --all --branches &! |
|
||||||
| gwtmv | git worktree move |
|
| gke | gitk --all $(git log --walk-reflogs --pretty=%h) &! |
|
||||||
| gwtrm | git worktree remove |
|
| gtl | gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl |
|
||||||
|
|
||||||
### Main branch preference
|
### Main branch preference
|
||||||
|
|
||||||
Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
|
Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin
|
||||||
a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
|
favors using a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive
|
||||||
that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
|
term `main`. This means that any aliases and functions that previously used `master`, will use `main` if that
|
||||||
function `git_main_branch`.
|
branch exists. We do this via the function `git_main_branch`.
|
||||||
|
|
||||||
### Deprecated aliases
|
### Deprecated aliases
|
||||||
|
|
||||||
These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
|
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 |
|
| Alias | Command | Modification |
|
||||||
| :----- | :----------------------------------------------------- | :----------------------------------------------------- |
|
| :----- | :----------------------------------------------------- | :----------------------------------------------------- |
|
||||||
@ -238,23 +239,27 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
|
|||||||
|
|
||||||
| Command | Description |
|
| Command | Description |
|
||||||
| :--------------------- | :------------------------------------------------------------------------------------------------------- |
|
| :--------------------- | :------------------------------------------------------------------------------------------------------- |
|
||||||
| `grename <old> <new>` | Rename `old` branch to `new`, including in origin remote |
|
|
||||||
| current_branch | Return the name of the current branch |
|
| 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 (lives in lib/git.zsh) |
|
||||||
| git_current_user_email | Returns the `user.email` config value |
|
| git_current_user_name | Returns the `user.name` config value (lives in lib/git.zsh) |
|
||||||
| 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 |
|
| git_develop_branch | Returns the name of the develop branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
|
||||||
|
| git_main_branch | Returns the name of the main branch: `main` if it exists, `master` otherwise |
|
||||||
|
| grename \<old> \<new> | Rename `old` branch to `new`, including in origin remote |
|
||||||
|
|
||||||
### Work in Progress (WIP)
|
### 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.
|
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 |
|
| Command | Description |
|
||||||
| :--------------- | :---------------------------------------------- |
|
| :--------------- | :---------------------------------------------- |
|
||||||
| work_in_progress | Echoes a warning if the current branch is a wip |
|
|
||||||
| gwip | Commit wip branch |
|
| gwip | Commit wip branch |
|
||||||
| gunwip | Uncommit wip branch |
|
| gunwip | Uncommit wip branch |
|
||||||
| gunwipall | Uncommit all recent `--wip--` commits |
|
| gunwipall | Uncommit all recent `--wip--` commits |
|
||||||
|
| work_in_progress | Echoes a warning if the current branch is a wip |
|
||||||
|
|
||||||
|
Note that `gwip` and `gunwip` are effectivly alias, but are also documented here to group all related WIP
|
||||||
|
features.
|
||||||
|
|
||||||
### Deprecated functions
|
### Deprecated functions
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,9 @@ autoload -Uz is-at-least
|
|||||||
git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
|
git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Functions
|
# Functions Current
|
||||||
|
# (sorted alphabetically by function name)
|
||||||
|
# (order should follow README)
|
||||||
#
|
#
|
||||||
|
|
||||||
# The name of the current branch
|
# The name of the current branch
|
||||||
@ -14,42 +16,6 @@ function current_branch() {
|
|||||||
git_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!!"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Similar to `gunwip` but recursive "Unwips" all recent `--wip--` commits not just the last one
|
|
||||||
function gunwipall() {
|
|
||||||
local _commit=$(git log --grep='--wip--' --invert-grep --max-count=1 --format=format:%H)
|
|
||||||
|
|
||||||
# Check if a commit without "--wip--" was found and it's not the same as HEAD
|
|
||||||
if [[ "$_commit" != "$(git rev-parse HEAD)" ]]; then
|
|
||||||
git reset $_commit || return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# 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:t}
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo master
|
|
||||||
}
|
|
||||||
|
|
||||||
# Check for develop and similarly named branches
|
# Check for develop and similarly named branches
|
||||||
function git_develop_branch() {
|
function git_develop_branch() {
|
||||||
command git rev-parse --git-dir &>/dev/null || return
|
command git rev-parse --git-dir &>/dev/null || return
|
||||||
@ -63,289 +29,18 @@ function git_develop_branch() {
|
|||||||
echo develop
|
echo develop
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
# Check if main exists and use instead of master
|
||||||
# Aliases
|
function git_main_branch() {
|
||||||
# (sorted alphabetically)
|
command git rev-parse --git-dir &>/dev/null || return
|
||||||
#
|
local ref
|
||||||
|
for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do
|
||||||
alias g='git'
|
if command git show-ref -q --verify $ref; then
|
||||||
|
echo ${ref:t}
|
||||||
alias ga='git add'
|
return
|
||||||
alias gaa='git add --all'
|
fi
|
||||||
alias gapa='git add --patch'
|
done
|
||||||
alias gau='git add --update'
|
echo master
|
||||||
alias gav='git add --verbose'
|
|
||||||
alias gap='git apply'
|
|
||||||
alias gapt='git apply --3way'
|
|
||||||
|
|
||||||
alias gb='git branch'
|
|
||||||
alias gba='git branch --all'
|
|
||||||
alias gbd='git branch --delete'
|
|
||||||
alias gbda='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 gbD='git branch --delete --force'
|
|
||||||
alias gbg='git branch -vv | grep ": gone\]"'
|
|
||||||
alias gbgd='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d'
|
|
||||||
alias gbgD='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs 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 --verbose'
|
|
||||||
alias gc!='git commit --verbose --amend'
|
|
||||||
alias gcn!='git commit --verbose --no-edit --amend'
|
|
||||||
alias gca='git commit --verbose --all'
|
|
||||||
alias gca!='git commit --verbose --all --amend'
|
|
||||||
alias gcan!='git commit --verbose --all --no-edit --amend'
|
|
||||||
alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
|
|
||||||
alias gcam='git commit --all --message'
|
|
||||||
alias gcsm='git commit --signoff --message'
|
|
||||||
alias gcas='git commit --all --signoff'
|
|
||||||
alias gcasm='git commit --all --signoff --message'
|
|
||||||
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 --interactive -d'
|
|
||||||
alias gpristine='git reset --hard && git clean --force -dfx'
|
|
||||||
alias gcm='git checkout $(git_main_branch)'
|
|
||||||
alias gcd='git checkout $(git_develop_branch)'
|
|
||||||
alias gcmsg='git commit --message'
|
|
||||||
alias gco='git checkout'
|
|
||||||
alias gcor='git checkout --recurse-submodules'
|
|
||||||
alias gcount='git shortlog --summary --numbered'
|
|
||||||
alias gcp='git cherry-pick'
|
|
||||||
alias gcpa='git cherry-pick --abort'
|
|
||||||
alias gcpc='git cherry-pick --continue'
|
|
||||||
alias gcs='git commit --gpg-sign'
|
|
||||||
alias gcss='git commit --gpg-sign --signoff'
|
|
||||||
alias gcssm='git commit --gpg-sign --signoff --message'
|
|
||||||
|
|
||||||
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)'
|
|
||||||
is-at-least 2.30 "$git_version" \
|
|
||||||
&& alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes' \
|
|
||||||
|| alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
|
|
||||||
|
|
||||||
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 --walk-reflogs --pretty=%h) &!'
|
|
||||||
|
|
||||||
alias gl='git pull'
|
|
||||||
alias glg='git log --stat'
|
|
||||||
alias glgp='git log --stat --patch'
|
|
||||||
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 gms="git merge --squash"
|
|
||||||
|
|
||||||
alias gp='git push'
|
|
||||||
alias gpd='git push --dry-run'
|
|
||||||
is-at-least 2.30 "$git_version" \
|
|
||||||
&& alias gpf='git push --force-with-lease --force-if-includes' \
|
|
||||||
|| alias gpf='git push --force-with-lease'
|
|
||||||
alias gpf!='git push --force'
|
|
||||||
alias gpoat='git push origin --all && git push origin --tags'
|
|
||||||
alias gpod='git push origin --delete'
|
|
||||||
alias gpr='git pull --rebase'
|
|
||||||
alias gpu='git push upstream'
|
|
||||||
alias gpv='git push --verbose'
|
|
||||||
|
|
||||||
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 --interactive'
|
|
||||||
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 --verbose'
|
|
||||||
|
|
||||||
alias gsb='git status --short --branch'
|
|
||||||
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 --short'
|
|
||||||
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 --create'
|
|
||||||
alias gswm='git switch $(git_main_branch)'
|
|
||||||
alias gswd='git switch $(git_develop_branch)'
|
|
||||||
|
|
||||||
alias gts='git tag --sign'
|
|
||||||
alias gtv='git tag | sort -V'
|
|
||||||
alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
|
|
||||||
|
|
||||||
alias gunignore='git update-index --no-assume-unchanged'
|
|
||||||
alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
|
|
||||||
alias gup='git pull --rebase'
|
|
||||||
alias gupv='git pull --rebase --verbose'
|
|
||||||
alias gupa='git pull --rebase --autostash'
|
|
||||||
alias gupav='git pull --rebase --autostash --verbose'
|
|
||||||
alias gupom='git pull --rebase origin $(git_main_branch)'
|
|
||||||
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
|
|
||||||
alias glum='git pull upstream $(git_main_branch)'
|
|
||||||
alias gluc='git pull upstream $(git_current_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 --message "--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 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() {
|
function grename() {
|
||||||
if [[ -z "$1" || -z "$2" ]]; then
|
if [[ -z "$1" || -z "$2" ]]; then
|
||||||
@ -361,4 +56,305 @@ function grename() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Functions Work in Progress (WIP)
|
||||||
|
# (sorted alphabetically by function name)
|
||||||
|
# (order should follow README)
|
||||||
|
#
|
||||||
|
|
||||||
|
# Similar to `gunwip` but recursive "Unwips" all recent `--wip--` commits not just the last one
|
||||||
|
function gunwipall() {
|
||||||
|
local _commit=$(git log --grep='--wip--' --invert-grep --max-count=1 --format=format:%H)
|
||||||
|
|
||||||
|
# Check if a commit without "--wip--" was found and it's not the same as HEAD
|
||||||
|
if [[ "$_commit" != "$(git rev-parse HEAD)" ]]; then
|
||||||
|
git reset $_commit || return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# 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!!"
|
||||||
|
}
|
||||||
|
|
||||||
|
#
|
||||||
|
# Aliases
|
||||||
|
# (sorted alphabetically by command)
|
||||||
|
# (order should follow README)
|
||||||
|
# (in some cases force the alisas order to match README, like for example gke and gk)
|
||||||
|
#
|
||||||
|
|
||||||
|
alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
|
||||||
|
|
||||||
|
function ggpnp() {
|
||||||
|
if [[ "$#" == 0 ]]; then
|
||||||
|
ggl && ggp
|
||||||
|
else
|
||||||
|
ggl "${*}" && ggp "${*}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
compdef _git ggpnp=git-checkout
|
||||||
|
|
||||||
|
alias ggpur='ggu'
|
||||||
|
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 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 gam='git am'
|
||||||
|
alias gama='git am --abort'
|
||||||
|
alias gamc='git am --continue'
|
||||||
|
alias gamscp='git am --show-current-patch'
|
||||||
|
alias gams='git am --skip'
|
||||||
|
alias gap='git apply'
|
||||||
|
alias gapt='git apply --3way'
|
||||||
|
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 gbl='git blame -b -w'
|
||||||
|
alias gb='git branch'
|
||||||
|
alias gba='git branch --all'
|
||||||
|
alias gbd='git branch --delete'
|
||||||
|
alias gbD='git branch --delete --force'
|
||||||
|
alias gbda='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 gbgd='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d'
|
||||||
|
alias gbgD='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D'
|
||||||
|
alias gbnm='git branch --no-merged'
|
||||||
|
alias gbr='git branch --remote'
|
||||||
|
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
|
||||||
|
alias gbg='git branch -vv | grep ": gone\]"'
|
||||||
|
alias gco='git checkout'
|
||||||
|
alias gcor='git checkout --recurse-submodules'
|
||||||
|
alias gcb='git checkout -b'
|
||||||
|
alias gcd='git checkout $(git_develop_branch)'
|
||||||
|
alias gcm='git checkout $(git_main_branch)'
|
||||||
|
alias gcp='git cherry-pick'
|
||||||
|
alias gcpa='git cherry-pick --abort'
|
||||||
|
alias gcpc='git cherry-pick --continue'
|
||||||
|
alias gclean='git clean --interactive -d'
|
||||||
|
alias gcl='git clone --recurse-submodules'
|
||||||
|
|
||||||
|
function gccd() {
|
||||||
|
command git clone --recurse-submodules "$@"
|
||||||
|
[[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
|
||||||
|
}
|
||||||
|
compdef _git gccd=git-clone
|
||||||
|
|
||||||
|
alias gcam='git commit --all --message'
|
||||||
|
alias gcas='git commit --all --signoff'
|
||||||
|
alias gcasm='git commit --all --signoff --message'
|
||||||
|
alias gcs='git commit --gpg-sign'
|
||||||
|
alias gcss='git commit --gpg-sign --signoff'
|
||||||
|
alias gcssm='git commit --gpg-sign --signoff --message'
|
||||||
|
alias gcmsg='git commit --message'
|
||||||
|
alias gcsm='git commit --signoff --message'
|
||||||
|
alias gc='git commit --verbose'
|
||||||
|
alias gca='git commit --verbose --all'
|
||||||
|
alias gca!='git commit --verbose --all --amend'
|
||||||
|
alias gcan!='git commit --verbose --all --no-edit --amend'
|
||||||
|
alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
|
||||||
|
alias gc!='git commit --verbose --amend'
|
||||||
|
alias gcn!='git commit --verbose --no-edit --amend'
|
||||||
|
alias gcf='git config --list'
|
||||||
|
alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
|
||||||
|
alias gd='git diff'
|
||||||
|
alias gdca='git diff --cached'
|
||||||
|
alias gdcw='git diff --cached --word-diff'
|
||||||
|
alias gds='git diff --staged'
|
||||||
|
alias gdw='git diff --word-diff'
|
||||||
|
|
||||||
|
function gdv() { git diff -w "$@" | view - }
|
||||||
|
compdef _git gdv=git-diff
|
||||||
|
|
||||||
|
alias gdup='git diff @{upstream}'
|
||||||
|
|
||||||
|
function gdnolock() {
|
||||||
|
git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
|
||||||
|
}
|
||||||
|
compdef _git gdnolock=git-diff
|
||||||
|
|
||||||
|
alias gdt='git diff-tree --no-commit-id --name-only -r'
|
||||||
|
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 gg='git gui citool'
|
||||||
|
alias gga='git gui citool --amend'
|
||||||
|
alias ghh='git help'
|
||||||
|
alias glgg='git log --graph'
|
||||||
|
alias glgga='git log --graph --decorate --all'
|
||||||
|
alias glgm='git log --graph --max-count=10'
|
||||||
|
alias glods='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short'
|
||||||
|
alias glod='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"'
|
||||||
|
alias glola='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all'
|
||||||
|
alias glols='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat'
|
||||||
|
alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
|
||||||
|
alias glo='git log --oneline --decorate'
|
||||||
|
alias glog='git log --oneline --decorate --graph'
|
||||||
|
alias gloga='git log --oneline --decorate --graph --all'
|
||||||
|
|
||||||
|
# Pretty log messages
|
||||||
|
function _git_log_prettily(){
|
||||||
|
if ! [ -z $1 ]; then
|
||||||
|
git log --pretty=$1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
compdef _git _git_log_prettily=git-log
|
||||||
|
|
||||||
|
alias glp='_git_log_prettily'
|
||||||
|
alias glg='git log --stat'
|
||||||
|
alias glgp='git log --stat --patch'
|
||||||
|
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
|
||||||
|
alias gfg='git ls-files | grep'
|
||||||
|
alias gm='git merge'
|
||||||
|
alias gma='git merge --abort'
|
||||||
|
alias gms="git merge --squash"
|
||||||
|
alias gmom='git merge origin/$(git_main_branch)'
|
||||||
|
alias gmum='git merge upstream/$(git_main_branch)'
|
||||||
|
alias gmtl='git mergetool --no-prompt'
|
||||||
|
alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
|
||||||
|
alias gl='git pull'
|
||||||
|
alias gpr='git pull --rebase'
|
||||||
|
alias gup='git pull --rebase'
|
||||||
|
alias gupa='git pull --rebase --autostash'
|
||||||
|
alias gupav='git pull --rebase --autostash --verbose'
|
||||||
|
alias gupv='git pull --rebase --verbose'
|
||||||
|
|
||||||
|
function ggu() {
|
||||||
|
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
||||||
|
git pull --rebase origin "${b:=$1}"
|
||||||
|
}
|
||||||
|
compdef _git ggu=git-checkout
|
||||||
|
|
||||||
|
alias gupom='git pull --rebase origin $(git_main_branch)'
|
||||||
|
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
|
||||||
|
alias ggpull='git pull origin "$(git_current_branch)"'
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
alias gluc='git pull upstream $(git_current_branch)'
|
||||||
|
alias glum='git pull upstream $(git_main_branch)'
|
||||||
|
alias gp='git push'
|
||||||
|
alias gpd='git push --dry-run'
|
||||||
|
|
||||||
|
function ggf() {
|
||||||
|
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
||||||
|
git push --force origin "${b:=$1}"
|
||||||
|
}
|
||||||
|
compdef _git ggf=git-checkout
|
||||||
|
|
||||||
|
alias gpf!='git push --force'
|
||||||
|
is-at-least 2.30 "$git_version" \
|
||||||
|
&& alias gpf='git push --force-with-lease --force-if-includes' \
|
||||||
|
|| alias gpf='git push --force-with-lease'
|
||||||
|
|
||||||
|
function ggfl() {
|
||||||
|
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
||||||
|
git push --force-with-lease origin "${b:=$1}"
|
||||||
|
}
|
||||||
|
compdef _git ggfl=git-checkout
|
||||||
|
|
||||||
|
alias gpsup='git push --set-upstream origin $(git_current_branch)'
|
||||||
|
is-at-least 2.30 "$git_version" \
|
||||||
|
&& alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes' \
|
||||||
|
|| alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
|
||||||
|
alias gpv='git push --verbose'
|
||||||
|
alias gpoat='git push origin --all && git push origin --tags'
|
||||||
|
alias gpod='git push origin --delete'
|
||||||
|
alias ggpush='git push origin "$(git_current_branch)"'
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
alias gpu='git push upstream'
|
||||||
|
alias grb='git rebase'
|
||||||
|
alias grba='git rebase --abort'
|
||||||
|
alias grbc='git rebase --continue'
|
||||||
|
alias grbi='git rebase --interactive'
|
||||||
|
alias grbo='git rebase --onto'
|
||||||
|
alias grbs='git rebase --skip'
|
||||||
|
alias grbd='git rebase $(git_develop_branch)'
|
||||||
|
alias grbm='git rebase $(git_main_branch)'
|
||||||
|
alias grbom='git rebase origin/$(git_main_branch)'
|
||||||
|
alias gr='git remote'
|
||||||
|
alias grv='git remote --verbose'
|
||||||
|
alias gra='git remote add'
|
||||||
|
alias grrm='git remote remove'
|
||||||
|
alias grmv='git remote rename'
|
||||||
|
alias grset='git remote set-url'
|
||||||
|
alias grup='git remote update'
|
||||||
|
alias grh='git reset'
|
||||||
|
alias gru='git reset --'
|
||||||
|
alias grhh='git reset --hard'
|
||||||
|
alias gpristine='git reset --hard && git clean --force -dfx'
|
||||||
|
alias groh='git reset origin/$(git_current_branch) --hard'
|
||||||
|
alias grs='git restore'
|
||||||
|
alias grss='git restore --source'
|
||||||
|
alias grst='git restore --staged'
|
||||||
|
alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
|
||||||
|
alias grev='git revert'
|
||||||
|
alias grm='git rm'
|
||||||
|
alias grmc='git rm --cached'
|
||||||
|
alias gcount='git shortlog --summary --numbered'
|
||||||
|
alias gsh='git show'
|
||||||
|
alias gsps='git show --pretty=short --show-signature'
|
||||||
|
alias gstall='git stash --all'
|
||||||
|
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'
|
||||||
|
# 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 gsts='git stash show --text'
|
||||||
|
alias gst='git status'
|
||||||
|
alias gss='git status --short'
|
||||||
|
alias gsb='git status --short --branch'
|
||||||
|
alias gsi='git submodule init'
|
||||||
|
alias gsu='git submodule update'
|
||||||
|
alias gsd='git svn dcommit'
|
||||||
|
alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
|
||||||
|
alias gsr='git svn rebase'
|
||||||
|
alias gsw='git switch'
|
||||||
|
alias gswc='git switch --create'
|
||||||
|
alias gswd='git switch $(git_develop_branch)'
|
||||||
|
alias gswm='git switch $(git_main_branch)'
|
||||||
|
alias gts='git tag --sign'
|
||||||
|
alias gtv='git tag | sort -V'
|
||||||
|
alias gignore='git update-index --assume-unchanged'
|
||||||
|
alias gunignore='git update-index --no-assume-unchanged'
|
||||||
|
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
||||||
|
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 gstu='gsta --include-untracked'
|
||||||
|
alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
|
||||||
|
alias gk='\gitk --all --branches &!'
|
||||||
|
alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
|
||||||
|
|
||||||
unset git_version
|
unset git_version
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user