diff --git a/git/global.gitconfig b/git/global.gitconfig index dbf24e8..10dd213 100644 --- a/git/global.gitconfig +++ b/git/global.gitconfig @@ -1,5 +1,5 @@ [user] - email = einverne@gmail.com + email = git@einverne.info 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 diff --git a/git/work.gitconfig b/git/work.gitconfig index d75aefa..3c23dce 100644 --- a/git/work.gitconfig +++ b/git/work.gitconfig @@ -1,3 +1,3 @@ [user] - name = wuijawei - email = wujiawei@xiaomi.com + name = yourname + email = name@company.com