From 5c6306deb71cadff1452778fad7ffad53381e8ef Mon Sep 17 00:00:00 2001 From: Gurkirat Singh Date: Tue, 9 Mar 2021 02:24:12 +0530 Subject: [PATCH] alias (improvement): continue rebase after conflict resolve --- aliases/available/git.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index bdc63752..478861ba 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -127,6 +127,7 @@ alias grm='git rm' # rebase alias grb='git rebase' +alias grbc='git rebase --continue' alias grm='git rebase master' alias grmi='git rebase master -i' alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master