XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate declaration of `grm`, update `grb<*>` 

Consolidates the `git rebase` aliases thus fixing the unintended overloading of `grm`.
`gdel` is outphased as an unclear, non-intuitive sibling of `gbD` (git branch --delete --force).

As discussed in #2160.
pull/2183/head
Peter Bittner 2022-12-06 02:02:14 +01:00
parent 66ae9b0de8
commit 0c4768dac5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aliases/available/git.aliases.bash
View File

@ -21,7 +21,6 @@ alias gblr='git branch --list --remotes'
alias gbm='git branch --move'
alias gbr='git branch --remotes'
alias gbt='git branch --track'
alias gdel='git branch -D'
# for-each-ref
alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC' # FROM https://stackoverflow.com/a/58623139/10362396
@ -133,9 +132,9 @@ alias grm='git rm'
# rebase
alias grb='git rebase'
alias grbc='git rebase --continue'
alias grm='git rebase $(get_default_branch)'
alias grmi='git rebase $(get_default_branch) -i'
alias grma='GIT_SEQUENCE_EDITOR=: git rebase $(get_default_branch) -i --autosquash'
alias grbm='git rebase $(get_default_branch)'
alias grbmi='git rebase $(get_default_branch) -i'
alias grbma='GIT_SEQUENCE_EDITOR=: git rebase $(get_default_branch) -i --autosquash'
alias gprom='git fetch origin $(get_default_branch) && git rebase origin/$(get_default_branch) && git update-ref refs/heads/$(get_default_branch) origin/$(get_default_branch)' # Rebase with latest remote
# reset