Update Git config
This commit is contained in:
parent
ffbfc313b8
commit
b6e6625a32
1 changed files with 4 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
||||||
[user]
|
[user]
|
||||||
name = Viyurz
|
name = Viyurz
|
||||||
email = 128215328+Viyurz@users.noreply.github.com
|
email = 128215328+Viyurz@users.noreply.github.com
|
||||||
signingkey = /home/viyurz/.ssh/id_ed25519.pub
|
signingkey = ~/.ssh/id_ed25519.pub
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[commit]
|
[commit]
|
||||||
|
@ -20,10 +20,11 @@
|
||||||
d = diff
|
d = diff
|
||||||
l = log
|
l = log
|
||||||
m = merge
|
m = merge
|
||||||
|
ca = commit --amend --no-edit
|
||||||
r = rebase
|
r = rebase
|
||||||
s = status
|
s = status
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
ff = no
|
ff = no
|
||||||
commit = no
|
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
[core]
|
||||||
|
autocrlf = input
|
||||||
|
|
Loading…
Reference in a new issue