alias (improvement): continue rebase after conflict resolve

pull/1847/head
Gurkirat Singh 2021-03-09 02:24:12 +05:30 committed by GitHub
parent 6093ecbb60
commit 5c6306deb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions

View File

@ -127,6 +127,7 @@ alias grm='git rm'
# rebase # rebase
alias grb='git rebase' alias grb='git rebase'
alias grbc='git rebase --continue'
alias grm='git rebase master' alias grm='git rebase master'
alias grmi='git rebase master -i' 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 alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master