1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

aliases: fix gfrb rebasing on non-default origins

Add gfrbi for an interactive fetch-and-rebase.

Signed-off-by: Joe Groocock <me@frebib.net>
This commit is contained in:
Joe Groocock 2021-09-21 16:53:07 +00:00
parent a6f162b7e2
commit e25953d913
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -137,7 +137,8 @@ alias grbc="grb --continue"
alias grbsk="grb --skip" alias grbsk="grb --skip"
alias grbsh="grb --show-current" alias grbsh="grb --show-current"
alias grbom="git rebase origin/master" alias grbom="git rebase origin/master"
alias gfrb="git fetch && git rebase" gfrb() { remote="${1%/*}"; git fetch "$remote" && git rebase "$@"; }
gfrbi() { remote="${1%/*}"; git fetch "$remote" && git rebase -i "$@"; }
alias gam="git am" alias gam="git am"
alias gama="git am --abort" alias gama="git am --abort"