Change summary
dot_config/git/config.tmpl | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
Detailed changes
@@ -1,19 +1,21 @@
[init]
defaultBranch = main
[alias]
- force-push = push --force-with-lease
+ force-push = push --force-with-lease
[user]
+ name = Amolith
+ email = amolith@secluded.site
{{- if eq .chezmoi.hostname "angmar" }}
signingkey = ~/.ssh/yk-stationary.pub
{{- else }}
signingkey = ~/.ssh/yk-mobile.pub
{{- end }}
- name = Amolith
- email = amolith@secluded.site
[commit]
gpgsign = true
+ verbose = true
[tag]
gpgsign = true
+ sort = version:refname
[gpg]
format = ssh
[gpg "ssh"]
@@ -28,6 +30,8 @@
helper = !op read "op://Private/git-send-email-amo_sec/password"
[core]
pager = delta
+ fsmonitor = true
+ untrackedCache = true
[delta]
line-numbers = true
{{- if eq .theme_variant "dark" }}
@@ -46,6 +50,7 @@
default = current
[branch]
autoSetupMerge = always
+ sort = -committerdate
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
@@ -53,5 +58,16 @@
required = true
[rerere]
enabled = true
+ autoupdate = true
[help]
autocorrect = prompt
+[column]
+ ui = auto
+[diff]
+ algorithm = histogram
+ renames = true
+[rebase]
+ updateRefs = true
+ autoStash = true
+[merge]
+ conflictstyle = zdiff3