Make user account a seperate file, update default branch
This commit is contained in:
59
.gitconfig
59
.gitconfig
@@ -1,49 +1,48 @@
|
||||
[user]
|
||||
email = mitchel@organiq.nl
|
||||
name = Mitchel
|
||||
[include]
|
||||
path = .gitconfig_user
|
||||
[column]
|
||||
ui = auto
|
||||
ui = auto
|
||||
[branch]
|
||||
sort = -committerdate
|
||||
sort = -committerdate
|
||||
[tag]
|
||||
sort = version:refname
|
||||
sort = version:refname
|
||||
[init]
|
||||
defaultBranch = main
|
||||
defaultBranch = master
|
||||
[diff]
|
||||
algorithm = histogram
|
||||
colorMoved = plain
|
||||
mnemonicPrefix = true
|
||||
renames = true
|
||||
algorithm = histogram
|
||||
colorMoved = plain
|
||||
mnemonicPrefix = true
|
||||
renames = true
|
||||
[push]
|
||||
default = simple
|
||||
autoSetupRemote = true
|
||||
followTags = true
|
||||
default = simple
|
||||
autoSetupRemote = true
|
||||
followTags = true
|
||||
[fetch]
|
||||
prune = true
|
||||
pruneTags = true
|
||||
all = true
|
||||
prune = true
|
||||
pruneTags = true
|
||||
all = true
|
||||
|
||||
[help]
|
||||
autocorrect = prompt
|
||||
autocorrect = prompt
|
||||
[commit]
|
||||
verbose = true
|
||||
verbose = true
|
||||
[rerere]
|
||||
enabled = true
|
||||
autoupdate = true
|
||||
enabled = true
|
||||
autoupdate = true
|
||||
[core]
|
||||
excludesfile = ~/.gitignore
|
||||
excludesfile = ~/.gitignore
|
||||
[rebase]
|
||||
autoSquash = true
|
||||
autoStash = true
|
||||
updateRefs = true
|
||||
autoSquash = true
|
||||
autoStash = true
|
||||
updateRefs = true
|
||||
|
||||
# a matter of taste (uncomment if you dare)
|
||||
|
||||
[core]
|
||||
# fsmonitor = true
|
||||
# untrackedCache = true
|
||||
# fsmonitor = true
|
||||
# untrackedCache = true
|
||||
[merge]
|
||||
# (just 'diff3' if git version < 2.3)
|
||||
conflictstyle = zdiff3
|
||||
# (just 'diff3' if git version < 2.3)
|
||||
conflictstyle = zdiff3
|
||||
[pull]
|
||||
rebase = true
|
||||
rebase = true
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
"extras": [
|
||||
|
||||
],
|
||||
"install_version": 7,
|
||||
"news": {
|
||||
"NEWS.md": "6520"
|
||||
"NEWS.md": "10960"
|
||||
},
|
||||
"version": 6
|
||||
"version": 8
|
||||
}
|
||||
Reference in New Issue
Block a user