1
0
Fork 0
mirror of https://github.com/MillironX/dotfiles.git synced 2024-11-21 13:16:04 +00:00
dotfiles/executable_dot_gitconfig.tmpl
Thomas A. Christensen II 0043e59068
Add default merge mode to gitconfig
Signed-off-by: Thomas A. Christensen II <25492070+MillironX@users.noreply.github.com>
2021-12-15 10:15:04 -06:00

22 lines
328 B
Cheetah

[user]
name = {{ .name }}
email = {{ .email }}
signingkey = {{ .pubkey }}
[core]
editor = nano
[credential]
helper = store
[color]
ui = auto
[init]
defaultBranch = master
[github]
user = MillironX
[pull]
rebase = false
{{- if eq .chezmoi.osRelease.id "fedora" }}
[diff]
tool = kdiff3
[merge]
tool = kdiff3
{{- end }}