i
/
dotfiles
mirror of https://github.com/einverne/dotfiles.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update git config

pull/6/head
Ein Verne 3 years ago
parent
79888777ee
commit
7f29036641
No known key found for this signature in database
GPG Key ID: 926634D64ACAD792
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      git/global.gitconfig
  2. 4
      git/work.gitconfig

10
git/global.gitconfig
Unescape View File

@ -1,5 +1,5 @@
[user] [user]
email = [email protected] email = [email protected]
name = Ein Verne name = Ein Verne
signingkey = 926634D64ACAD792 signingkey = 926634D64ACAD792
[push] [push]
@ -79,15 +79,15 @@
git push -u origin $BRANCH_NAME; \ git push -u origin $BRANCH_NAME; \
hub pull-request; \ hub pull-request; \
};f " };f "
### rebase ### ### rebase ###
# rebase - forward-port local commits to the updated upstream head. # rebase - forward-port local commits to the updated upstream head.
rb = rebase rb = rebase
# rebase - continue the rebasing process after resolving a conflict manually and updating the index with the resolution. # rebase - continue the rebasing process after resolving a conflict manually and updating the index with the resolution.
rbc = rebase --continue rbc = rebase --continue
# rebase - restart the rebasing process by skipping the current patch. # rebase - restart the rebasing process by skipping the current patch.
rbs = rebase --skip rbs = rebase --skip

4
git/work.gitconfig
Unescape View File

@ -1,3 +1,3 @@
[user] [user]
name = wuijawei name = yourname
email = wujiawei@xiaomi.com email = name@company.com

Write Preview
Loading…
Cancel
Save