mirror of https://github.com/einverne/dotfiles.git
Ein Verne
3 years ago
2 changed files with 7 additions and 7 deletions
@ -1,5 +1,5 @@
|
||||
[user] |
||||
email = [email protected] |
||||
email = [email protected] |
||||
name = Ein Verne |
||||
signingkey = 926634D64ACAD792 |
||||
[push] |
||||
@ -79,15 +79,15 @@
|
||||
git push -u origin $BRANCH_NAME; \ |
||||
hub pull-request; \ |
||||
};f " |
||||
|
||||
|
||||
### rebase ### |
||||
|
||||
|
||||
# rebase - forward-port local commits to the updated upstream head. |
||||
rb = rebase |
||||
|
||||
|
||||
# rebase - continue the rebasing process after resolving a conflict manually and updating the index with the resolution. |
||||
rbc = rebase --continue |
||||
|
||||
|
||||
# rebase - restart the rebasing process by skipping the current patch. |
||||
rbs = rebase --skip |
||||
|
||||
|
Loading…
Reference in new issue