Unverified Commit 35454190 authored by Jack DeVries's avatar Jack DeVries Committed by Carlo Sala

feat(git): use verbose flags in aliases

Closes #11244 Closes #11246 Closes #10101 Closes #11380
parent 17ea9733
This diff is collapsed.
...@@ -69,10 +69,10 @@ alias gap='git apply' ...@@ -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' ...@@ -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() { ...@@ -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:]]"' ...@@ -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' ...@@ -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' ...@@ -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' ...@@ -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' ...@@ -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() { ...@@ -342,4 +341,4 @@ function grename() {
fi fi
} }
unset git_version unset git_version
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment