git: Update configuration
Some improvements taken from https://jvns.ca/blog/2024/02/16/popular-git-config-options/#submodule-stuff
This commit is contained in:
parent
cb46c82d53
commit
01749031fb
1 changed files with 13 additions and 4 deletions
|
@ -19,15 +19,19 @@
|
|||
[color]
|
||||
ui = true
|
||||
[commit]
|
||||
cleanup = scissors
|
||||
verbose = true
|
||||
[core]
|
||||
editor = nvim
|
||||
excludesfile = ~/.config/git/ignore
|
||||
[diff]
|
||||
tool = nvimdiff
|
||||
algorithm = histogram
|
||||
colorMoved = zebra
|
||||
colorMovedWS = allow-indentation-change
|
||||
context = 10
|
||||
interHunkContext = 10
|
||||
submodule = log
|
||||
tool = nvimdiff
|
||||
[difftool]
|
||||
prompt = false
|
||||
trustExitCode = true
|
||||
|
@ -38,6 +42,7 @@
|
|||
[difftool "kitty"]
|
||||
cmd = kitty +kitten diff $LOCAL $REMOTE
|
||||
[fetch]
|
||||
fsckObjects = true
|
||||
prune = true
|
||||
pruneTags = true
|
||||
[http]
|
||||
|
@ -47,13 +52,13 @@
|
|||
[log]
|
||||
follow = true
|
||||
[merge]
|
||||
tool = nvimdiff1
|
||||
conflictstyle = zdiff3
|
||||
ff = only
|
||||
tool = nvimdiff1
|
||||
[mergetool]
|
||||
prompt = false
|
||||
keepBackup = false
|
||||
hideResolved = false
|
||||
keepBackup = false
|
||||
prompt = false
|
||||
[mergetool "nvimdiff1"]
|
||||
hideResolved = true
|
||||
[pager]
|
||||
|
@ -74,8 +79,12 @@
|
|||
smtpserver = /usr/bin/msmtp
|
||||
[stash]
|
||||
showPatch = true
|
||||
[status]
|
||||
submoduleSummary = true
|
||||
[submodule]
|
||||
recurse = true
|
||||
[tag]
|
||||
sort = -taggerdate
|
||||
[transfer]
|
||||
fsckObjects = true
|
||||
[user]
|
||||
|
|
Loading…
Reference in a new issue