mirror of https://github.com/ohmyzsh/ohmyzsh.git
feat(git): use verbose flags in aliases
Closes #11244 Closes #11246 Closes #10101 Closes #11380pull/11440/head
parent
17ea97332b
commit
35454190f6
|
@ -10,191 +10,189 @@ plugins=(... git)
|
||||||
|
|
||||||
## Aliases
|
## Aliases
|
||||||
|
|
||||||
| Alias | Command |
|
| Alias | Command |
|
||||||
|:---------------------|:---------------------------------------------------------------------------------------------------------------------------------|
|
| :------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| 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 |
|
||||||
| gap | git apply |
|
| gap | git apply |
|
||||||
| gapt | git apply --3way |
|
| gapt | git apply --3way |
|
||||||
| gb | git branch |
|
| gb | git branch |
|
||||||
| gba | git branch -a |
|
| gba | git branch --all |
|
||||||
| gbd | git branch -d |
|
| gbd | git branch --delete |
|
||||||
| 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 -d 2>/dev/null |
|
| 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 |
|
||||||
| gbD | git branch -D |
|
| gbD | git branch --delete --force |
|
||||||
| gbl | git blame -b -w |
|
| gbl | git blame -b -w |
|
||||||
| gbnm | git branch --no-merged |
|
| gbnm | git branch --no-merged |
|
||||||
| gbr | git branch --remote |
|
| gbr | git branch --remote |
|
||||||
| gbs | git bisect |
|
| gbs | git bisect |
|
||||||
| gbsb | git bisect bad |
|
| gbsb | git bisect bad |
|
||||||
| gbsg | git bisect good |
|
| gbsg | git bisect good |
|
||||||
| gbsr | git bisect reset |
|
| gbsr | git bisect reset |
|
||||||
| gbss | git bisect start |
|
| gbss | git bisect start |
|
||||||
| gc | git commit -v |
|
| gc | git commit --verbose |
|
||||||
| gc! | git commit -v --amend |
|
| gc! | git commit --verbose --amend |
|
||||||
| gcn | git commit -v --no-edit |
|
| gcn! | git commit --verbose --no-edit --amend |
|
||||||
| gcn! | git commit -v --no-edit --amend |
|
| gca | git commit --verbose --all |
|
||||||
| gca | git commit -v -a |
|
| gca! | git commit --verbose --all --amend |
|
||||||
| gca! | git commit -v -a --amend |
|
| gcan! | git commit --verbose --all --no-edit --amend |
|
||||||
| gcan! | git commit -v -a --no-edit --amend |
|
| gcans! | git commit --verbose --all --signoff --no-edit --amend |
|
||||||
| gcans! | git commit -v -a -s --no-edit --amend |
|
| gcam | git commit --all --message |
|
||||||
| gcam | git commit -a -m |
|
| gcas | git commit --all --signoff |
|
||||||
| gcas | git commit -a -s |
|
| gcasm | git commit --all --signoff --message |
|
||||||
| gcasm | git commit -a -s -m |
|
| gcsm | git commit --signoff --message |
|
||||||
| gcsm | git commit -s -m |
|
| gcb | git checkout -b |
|
||||||
| gcb | git checkout -b |
|
| gcf | git config --list |
|
||||||
| gcf | git config --list |
|
| gcl | git clone --recurse-submodules |
|
||||||
| gcl | git clone --recurse-submodules |
|
| gccd | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>\_ .git)" |
|
||||||
| gccd | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>_ .git)" |
|
| gclean | git clean --interactive -d |
|
||||||
| gclean | git clean -id |
|
| gpristine | git reset --hard && git clean -dffx |
|
||||||
| gpristine | git reset --hard && git clean -dffx |
|
| gcm | git checkout $(git_main_branch) |
|
||||||
| gcm | git checkout $(git_main_branch) |
|
| gcd | git checkout $(git_develop_branch) |
|
||||||
| gcd | git checkout $(git_develop_branch) |
|
| gcmsg | git commit --message |
|
||||||
| gcmsg | git commit -m |
|
| gco | git checkout |
|
||||||
| gco | git checkout |
|
| gcor | git checkout --recurse-submodules |
|
||||||
| gcor | git checkout --recurse-submodules |
|
| gcount | git shortlog --summary -n |
|
||||||
| gcount | git shortlog -sn |
|
| 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 |
|
| gcs | git commit -S |
|
||||||
| gcs | git commit -S |
|
| 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 |
|
| gdct | git describe --tags $(git rev-list --tags --max-count=1) |
|
||||||
| gdct | git describe --tags $(git rev-list --tags --max-count=1) |
|
| gds | git diff --staged |
|
||||||
| gds | git diff --staged |
|
| gdt | git diff-tree --no-commit-id --name-only -r |
|
||||||
| gdt | git diff-tree --no-commit-id --name-only -r |
|
| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock" |
|
||||||
| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)*.lock" |
|
| gdup | git diff @{upstream} |
|
||||||
| gdup | git diff @{upstream} |
|
| gdv | git diff -w $@ \| view - |
|
||||||
| gdv | git diff -w $@ \| view - |
|
| gdw | git diff --word-diff |
|
||||||
| gdw | git diff --word-diff |
|
| gf | git fetch |
|
||||||
| gf | git fetch |
|
| gfa | git fetch --all --prune |
|
||||||
| gfa | git fetch --all --prune |
|
| gfg | git ls-files \| grep |
|
||||||
| gfg | git ls-files \| grep |
|
| 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 |
|
| ggf | git push --force origin $(current_branch) |
|
||||||
| ggf | git push --force origin $(current_branch) |
|
| ggfl | git push --force-with-lease origin $(current_branch) |
|
||||||
| ggfl | git push --force-with-lease origin $(current_branch) |
|
| ggl | git pull origin $(current_branch) |
|
||||||
| ggl | git pull origin $(current_branch) |
|
| ggp | git push origin $(current_branch) |
|
||||||
| ggp | git push origin $(current_branch) |
|
| ggpnp | ggl && ggp |
|
||||||
| ggpnp | ggl && ggp |
|
| ggpull | git pull origin "$(git_current_branch)" |
|
||||||
| ggpull | git pull origin "$(git_current_branch)" |
|
| ggpur | ggu |
|
||||||
| ggpur | ggu |
|
| ggpush | git push origin "$(git_current_branch)" |
|
||||||
| ggpush | git push origin "$(git_current_branch)" |
|
| ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
|
||||||
| ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
|
| ggu | git pull --rebase origin $(current_branch) |
|
||||||
| ggu | git pull --rebase origin $(current_branch) |
|
| gpsup | git push --set-upstream origin $(git_current_branch) |
|
||||||
| gpsup | git push --set-upstream origin $(git_current_branch) |
|
| ghh | git help |
|
||||||
| ghh | git help |
|
| gignore | git update-index --assume-unchanged |
|
||||||
| gignore | git update-index --assume-unchanged |
|
| gignored | git ls-files -v \| grep "^[[:lower:]]" |
|
||||||
| gignored | git ls-files -v \| grep "^[[:lower:]]" |
|
| 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 |
|
| gk | gitk --all --branches &! |
|
||||||
| gk | gitk --all --branches &! |
|
| gke | gitk --all $(git log --walk-reflogs --pretty=%h) &! |
|
||||||
| gke | gitk --all $(git log -g --pretty=%h) &! |
|
| gl | git pull |
|
||||||
| gl | git pull |
|
| glg | git log --stat |
|
||||||
| glg | git log --stat |
|
| glgp | git log --stat --patch |
|
||||||
| glgp | git log --stat -p |
|
| 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 |
|
| glo | git log --oneline --decorate |
|
||||||
| 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' |
|
||||||
| 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 |
|
||||||
| 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' |
|
||||||
| 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 |
|
| 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 |
|
| 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\> |
|
| gm | git merge |
|
||||||
| gm | git merge |
|
| gmom | git merge origin/$(git_main_branch) |
|
||||||
| gmom | git merge origin/$(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 |
|
| gmum | git merge upstream/$(git_main_branch) |
|
||||||
| gmum | git merge upstream/$(git_main_branch) |
|
| gma | git merge --abort |
|
||||||
| gma | git merge --abort |
|
| gp | git push |
|
||||||
| gp | git push |
|
| gpd | git push --dry-run |
|
||||||
| gpd | git push --dry-run |
|
| gpf | git push --force-with-lease |
|
||||||
| gpf | git push --force-with-lease |
|
| gpf! | git push --force |
|
||||||
| gpf! | git push --force |
|
| gpoat | git push origin --all && git push origin --tags |
|
||||||
| gpoat | git push origin --all && git push origin --tags |
|
| gpr | git pull --rebase |
|
||||||
| gpr | git pull --rebase |
|
| gpu | git push upstream |
|
||||||
| gpu | git push upstream |
|
| gpv | git push --verbose |
|
||||||
| gpv | git push -v |
|
| gr | git remote |
|
||||||
| gr | git remote |
|
| gra | git remote add |
|
||||||
| gra | git remote add |
|
| grb | git rebase |
|
||||||
| grb | git rebase |
|
| grba | git rebase --abort |
|
||||||
| grba | git rebase --abort |
|
| grbc | git rebase --continue |
|
||||||
| grbc | git rebase --continue |
|
| grbd | git rebase $(git_develop_branch) |
|
||||||
| grbd | git rebase $(git_develop_branch) |
|
| grbi | git rebase --interactive |
|
||||||
| grbi | git rebase -i |
|
| 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) |
|
| grbo | git rebase --onto |
|
||||||
| grbo | git rebase --onto |
|
| grbs | git rebase --skip |
|
||||||
| grbs | git rebase --skip |
|
| grev | git revert |
|
||||||
| grev | git revert |
|
| grh | git reset |
|
||||||
| grh | git reset |
|
| grhh | git reset --hard |
|
||||||
| grhh | git reset --hard |
|
| groh | git reset origin/$(git_current_branch) --hard |
|
||||||
| groh | git reset origin/$(git_current_branch) --hard |
|
| grm | git rm |
|
||||||
| grm | git rm |
|
| grmc | git rm --cached |
|
||||||
| grmc | git rm --cached |
|
| grmv | git remote rename |
|
||||||
| grmv | git remote rename |
|
| grrm | git remote remove |
|
||||||
| grrm | git remote remove |
|
| grs | git restore |
|
||||||
| grs | git restore |
|
| grset | git remote set-url |
|
||||||
| grset | git remote set-url |
|
| grss | git restore --source |
|
||||||
| grss | git restore --source |
|
| grst | git restore --staged |
|
||||||
| grst | git restore --staged |
|
| grt | cd "$(git rev-parse --show-toplevel \|\| echo .)" |
|
||||||
| grt | cd "$(git rev-parse --show-toplevel \|\| echo .)" |
|
| gru | git reset -- |
|
||||||
| gru | git reset -- |
|
| grup | git remote update |
|
||||||
| grup | git remote update |
|
| grv | git remote --verbose |
|
||||||
| grv | git remote -v |
|
| gsb | git status --short -b |
|
||||||
| gsb | git status -sb |
|
| gsd | git svn dcommit |
|
||||||
| gsd | git svn dcommit |
|
| gsh | git show |
|
||||||
| gsh | git show |
|
| gsi | git submodule init |
|
||||||
| gsi | git submodule init |
|
| gsps | git show --pretty=short --show-signature |
|
||||||
| gsps | git show --pretty=short --show-signature |
|
| gsr | git svn rebase |
|
||||||
| gsr | git svn rebase |
|
| gss | git status --short |
|
||||||
| gss | git status -s |
|
| gst | git status |
|
||||||
| gst | git status |
|
| gsta | git stash push |
|
||||||
| gsta | git stash push |
|
| gsta | git stash save |
|
||||||
| gsta | git stash save |
|
| 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 |
|
| gsts | git stash show --text |
|
||||||
| gsts | git stash show --text |
|
| gstu | git stash --include-untracked |
|
||||||
| gstu | git stash --include-untracked |
|
| gstall | git stash --all |
|
||||||
| gstall | git stash --all |
|
| gsu | git submodule update |
|
||||||
| gsu | git submodule update |
|
| gsw | git switch |
|
||||||
| gsw | git switch |
|
| gswc | git switch -c |
|
||||||
| gswc | git switch -c |
|
| gswm | git switch $(git_main_branch) |
|
||||||
| gswm | git switch $(git_main_branch) |
|
| gswd | git switch $(git_develop_branch) |
|
||||||
| gswd | git switch $(git_develop_branch) |
|
| gts | git tag -s |
|
||||||
| gts | git tag -s |
|
| gtv | git tag \| sort -V |
|
||||||
| gtv | git tag \| sort -V |
|
| gtl | gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl |
|
||||||
| gtl | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl |
|
| gunignore | git update-index --no-assume-unchanged |
|
||||||
| gunignore | git update-index --no-assume-unchanged |
|
| gunwip | git log --max-count=1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 |
|
||||||
| gunwip | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 |
|
| gup | git pull --rebase |
|
||||||
| gup | git pull --rebase |
|
| gupv | git pull --rebase --verbose |
|
||||||
| gupv | git pull --rebase -v |
|
| gupa | git pull --rebase --autostash |
|
||||||
| gupa | git pull --rebase --autostash |
|
| gupav | git pull --rebase --autostash --verbose |
|
||||||
| gupav | git pull --rebase --autostash -v |
|
| gupom | git pull --rebase origin $(git_main_branch) |
|
||||||
| gupom | git pull --rebase origin $(git_main_branch) |
|
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
||||||
| gupomi | git pull --rebase=interactive origin $(git_main_branch) |
|
| glum | git pull upstream $(git_main_branch) |
|
||||||
| glum | git pull upstream $(git_main_branch) |
|
| gluc | git pull upstream $(git_current_branch) |
|
||||||
| gluc | git pull upstream $(git_current_branch) |
|
| gwch | git whatchanged -p --abbrev-commit --pretty=medium |
|
||||||
| 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 --message "--wip-- [skip ci]" |
|
||||||
| 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 |
|
||||||
| gam | git am |
|
| gamc | git am --continue |
|
||||||
| gamc | git am --continue |
|
| gams | git am --skip |
|
||||||
| gams | git am --skip |
|
| gama | git am --abort |
|
||||||
| gama | git am --abort |
|
| gamscp | git am --show-current-patch |
|
||||||
| gamscp | git am --show-current-patch |
|
|
||||||
| gwt | git worktree |
|
| gwt | git worktree |
|
||||||
| gwta | git worktree add |
|
|
||||||
| gwtls | git worktree list |
|
| gwtls | git worktree list |
|
||||||
| gwtmv | git worktree move |
|
| gwtmv | git worktree move |
|
||||||
| gwtrm | git worktree remove |
|
| gwtrm | git worktree remove |
|
||||||
|
|
|
@ -69,10 +69,10 @@ alias gap='git apply'
|
||||||
alias gapt='git apply --3way'
|
alias gapt='git apply --3way'
|
||||||
|
|
||||||
alias gb='git branch'
|
alias gb='git branch'
|
||||||
alias gba='git branch -a'
|
alias gba='git branch --all'
|
||||||
alias gbd='git branch -d'
|
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 -d 2>/dev/null'
|
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 -D'
|
alias gbD='git branch --delete --force'
|
||||||
alias gbl='git blame -b -w'
|
alias gbl='git blame -b -w'
|
||||||
alias gbnm='git branch --no-merged'
|
alias gbnm='git branch --no-merged'
|
||||||
alias gbr='git branch --remote'
|
alias gbr='git branch --remote'
|
||||||
|
@ -82,18 +82,17 @@ alias gbsg='git bisect good'
|
||||||
alias gbsr='git bisect reset'
|
alias gbsr='git bisect reset'
|
||||||
alias gbss='git bisect start'
|
alias gbss='git bisect start'
|
||||||
|
|
||||||
alias gc='git commit -v'
|
alias gc='git commit --verbose'
|
||||||
alias gc!='git commit -v --amend'
|
alias gc!='git commit --verbose --amend'
|
||||||
alias gcn='git commit -v --no-edit'
|
alias gcn!='git commit --verbose --no-edit --amend'
|
||||||
alias gcn!='git commit -v --no-edit --amend'
|
alias gca='git commit --verbose --all'
|
||||||
alias gca='git commit -v -a'
|
alias gca!='git commit --verbose --all --amend'
|
||||||
alias gca!='git commit -v -a --amend'
|
alias gcan!='git commit --verbose --all --no-edit --amend'
|
||||||
alias gcan!='git commit -v -a --no-edit --amend'
|
alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
|
||||||
alias gcans!='git commit -v -a -s --no-edit --amend'
|
alias gcam='git commit --all --message'
|
||||||
alias gcam='git commit -a -m'
|
alias gcsm='git commit --signoff --message'
|
||||||
alias gcsm='git commit -s -m'
|
alias gcas='git commit --all --signoff'
|
||||||
alias gcas='git commit -a -s'
|
alias gcasm='git commit --all --signoff --message'
|
||||||
alias gcasm='git commit -a -s -m'
|
|
||||||
alias gcb='git checkout -b'
|
alias gcb='git checkout -b'
|
||||||
alias gcf='git config --list'
|
alias gcf='git config --list'
|
||||||
|
|
||||||
|
@ -104,20 +103,20 @@ function gccd() {
|
||||||
compdef _git gccd=git-clone
|
compdef _git gccd=git-clone
|
||||||
|
|
||||||
alias gcl='git clone --recurse-submodules'
|
alias gcl='git clone --recurse-submodules'
|
||||||
alias gclean='git clean -id'
|
alias gclean='git clean --interactive -d'
|
||||||
alias gpristine='git reset --hard && git clean -dffx'
|
alias gpristine='git reset --hard && git clean --force -dx'
|
||||||
alias gcm='git checkout $(git_main_branch)'
|
alias gcm='git checkout $(git_main_branch)'
|
||||||
alias gcd='git checkout $(git_develop_branch)'
|
alias gcd='git checkout $(git_develop_branch)'
|
||||||
alias gcmsg='git commit -m'
|
alias gcmsg='git commit --message'
|
||||||
alias gco='git checkout'
|
alias gco='git checkout'
|
||||||
alias gcor='git checkout --recurse-submodules'
|
alias gcor='git checkout --recurse-submodules'
|
||||||
alias gcount='git shortlog -sn'
|
alias gcount='git shortlog --summary --numbered'
|
||||||
alias gcp='git cherry-pick'
|
alias gcp='git cherry-pick'
|
||||||
alias gcpa='git cherry-pick --abort'
|
alias gcpa='git cherry-pick --abort'
|
||||||
alias gcpc='git cherry-pick --continue'
|
alias gcpc='git cherry-pick --continue'
|
||||||
alias gcs='git commit -S'
|
alias gcs='git commit --gpg-sign'
|
||||||
alias gcss='git commit -S -s'
|
alias gcss='git commit --gpg-sign --signoff'
|
||||||
alias gcssm='git commit -S -s -m'
|
alias gcssm='git commit --gpg-sign --signoff --message'
|
||||||
|
|
||||||
alias gd='git diff'
|
alias gd='git diff'
|
||||||
alias gdca='git diff --cached'
|
alias gdca='git diff --cached'
|
||||||
|
@ -208,11 +207,11 @@ alias gignored='git ls-files -v | grep "^[[:lower:]]"'
|
||||||
alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
|
alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
|
||||||
|
|
||||||
alias gk='\gitk --all --branches &!'
|
alias gk='\gitk --all --branches &!'
|
||||||
alias gke='\gitk --all $(git log -g --pretty=%h) &!'
|
alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
|
||||||
|
|
||||||
alias gl='git pull'
|
alias gl='git pull'
|
||||||
alias glg='git log --stat'
|
alias glg='git log --stat'
|
||||||
alias glgp='git log --stat -p'
|
alias glgp='git log --stat --patch'
|
||||||
alias glgg='git log --graph'
|
alias glgg='git log --graph'
|
||||||
alias glgga='git log --graph --decorate --all'
|
alias glgga='git log --graph --decorate --all'
|
||||||
alias glgm='git log --graph --max-count=10'
|
alias glgm='git log --graph --max-count=10'
|
||||||
|
@ -240,7 +239,7 @@ alias gpf!='git push --force'
|
||||||
alias gpoat='git push origin --all && git push origin --tags'
|
alias gpoat='git push origin --all && git push origin --tags'
|
||||||
alias gpr='git pull --rebase'
|
alias gpr='git pull --rebase'
|
||||||
alias gpu='git push upstream'
|
alias gpu='git push upstream'
|
||||||
alias gpv='git push -v'
|
alias gpv='git push --verbose'
|
||||||
|
|
||||||
alias gr='git remote'
|
alias gr='git remote'
|
||||||
alias gra='git remote add'
|
alias gra='git remote add'
|
||||||
|
@ -248,7 +247,7 @@ alias grb='git rebase'
|
||||||
alias grba='git rebase --abort'
|
alias grba='git rebase --abort'
|
||||||
alias grbc='git rebase --continue'
|
alias grbc='git rebase --continue'
|
||||||
alias grbd='git rebase $(git_develop_branch)'
|
alias grbd='git rebase $(git_develop_branch)'
|
||||||
alias grbi='git rebase -i'
|
alias grbi='git rebase --interactive'
|
||||||
alias grbm='git rebase $(git_main_branch)'
|
alias grbm='git rebase $(git_main_branch)'
|
||||||
alias grbom='git rebase origin/$(git_main_branch)'
|
alias grbom='git rebase origin/$(git_main_branch)'
|
||||||
alias grbo='git rebase --onto'
|
alias grbo='git rebase --onto'
|
||||||
|
@ -268,15 +267,15 @@ alias grst='git restore --staged'
|
||||||
alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
|
alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
|
||||||
alias gru='git reset --'
|
alias gru='git reset --'
|
||||||
alias grup='git remote update'
|
alias grup='git remote update'
|
||||||
alias grv='git remote -v'
|
alias grv='git remote --verbose'
|
||||||
|
|
||||||
alias gsb='git status -sb'
|
alias gsb='git status --short --branch'
|
||||||
alias gsd='git svn dcommit'
|
alias gsd='git svn dcommit'
|
||||||
alias gsh='git show'
|
alias gsh='git show'
|
||||||
alias gsi='git submodule init'
|
alias gsi='git submodule init'
|
||||||
alias gsps='git show --pretty=short --show-signature'
|
alias gsps='git show --pretty=short --show-signature'
|
||||||
alias gsr='git svn rebase'
|
alias gsr='git svn rebase'
|
||||||
alias gss='git status -s'
|
alias gss='git status --short'
|
||||||
alias gst='git status'
|
alias gst='git status'
|
||||||
|
|
||||||
# use the default stash push on git 2.13 and newer
|
# use the default stash push on git 2.13 and newer
|
||||||
|
@ -294,27 +293,27 @@ alias gstu='gsta --include-untracked'
|
||||||
alias gstall='git stash --all'
|
alias gstall='git stash --all'
|
||||||
alias gsu='git submodule update'
|
alias gsu='git submodule update'
|
||||||
alias gsw='git switch'
|
alias gsw='git switch'
|
||||||
alias gswc='git switch -c'
|
alias gswc='git switch --create'
|
||||||
alias gswm='git switch $(git_main_branch)'
|
alias gswm='git switch $(git_main_branch)'
|
||||||
alias gswd='git switch $(git_develop_branch)'
|
alias gswd='git switch $(git_develop_branch)'
|
||||||
|
|
||||||
alias gts='git tag -s'
|
alias gts='git tag --sign'
|
||||||
alias gtv='git tag | sort -V'
|
alias gtv='git tag | sort -V'
|
||||||
alias gtl='gtl(){ git tag --sort=-v:refname -n -l "${1}*" }; noglob gtl'
|
alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
|
||||||
|
|
||||||
alias gunignore='git update-index --no-assume-unchanged'
|
alias gunignore='git update-index --no-assume-unchanged'
|
||||||
alias gunwip='git log -n 1 | grep -q -c "\--wip--" && git reset HEAD~1'
|
alias gunwip='git log --max-count=1 | grep -q -c "\--wip--" && git reset HEAD~1'
|
||||||
alias gup='git pull --rebase'
|
alias gup='git pull --rebase'
|
||||||
alias gupv='git pull --rebase -v'
|
alias gupv='git pull --rebase --verbose'
|
||||||
alias gupa='git pull --rebase --autostash'
|
alias gupa='git pull --rebase --autostash'
|
||||||
alias gupav='git pull --rebase --autostash -v'
|
alias gupav='git pull --rebase --autostash --verbose'
|
||||||
alias gupom='git pull --rebase origin $(git_main_branch)'
|
alias gupom='git pull --rebase origin $(git_main_branch)'
|
||||||
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
|
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
|
||||||
alias glum='git pull upstream $(git_main_branch)'
|
alias glum='git pull upstream $(git_main_branch)'
|
||||||
alias gluc='git pull upstream $(git_current_branch)'
|
alias gluc='git pull upstream $(git_current_branch)'
|
||||||
|
|
||||||
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
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 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 gwt='git worktree'
|
||||||
alias gwta='git worktree add'
|
alias gwta='git worktree add'
|
||||||
|
@ -342,4 +341,4 @@ function grename() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
unset git_version
|
unset git_version
|
Loading…
Reference in New Issue