From 0c4768dac565264f04011881012c701654569a7b Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Tue, 6 Dec 2022 02:02:14 +0100 Subject: [PATCH] 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. --- aliases/available/git.aliases.bash | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 5572c932..cea1c967 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -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