mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Cleanup gitconfig
This commit is contained in:
@@ -51,44 +51,46 @@
|
||||
[url "ssh://git@github.com/"]
|
||||
pushInsteadOf = "github:"
|
||||
pushInsteadOf = "github://"
|
||||
pushInsteadOf = "https://github.com/"
|
||||
|
||||
[url "git://gist.github.com/"]
|
||||
insteadOf = "gist:"
|
||||
insteadOf = "gist:"
|
||||
|
||||
[url "git@gist.github.com:"]
|
||||
pushInsteadOf = "gist:"
|
||||
pushInsteadOf = "git://gist.github.com/"
|
||||
pushInsteadOf = "gist:"
|
||||
pushInsteadOf = "git://gist.github.com/"
|
||||
|
||||
[credential]
|
||||
helper = cache --timeout=36000
|
||||
helper = cache --timeout=36000
|
||||
|
||||
[receive]
|
||||
denyCurrentBranch = updateInstead
|
||||
denyCurrentBranch = updateInstead
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
prompt = false
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig.local
|
||||
path = ~/.gitconfig.local
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
rebase = false
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
defaultBranch = main
|
||||
|
||||
[interactive]
|
||||
diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
|
||||
diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
|
||||
|
||||
[delta]
|
||||
navigate = true
|
||||
line-numbers = true
|
||||
|
||||
[filter "lfs"]
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
|
||||
Reference in New Issue
Block a user