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