diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index fefbb92..6bb0bd4 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -4,42 +4,47 @@ signingkey = 1A80DDB584AF7DA7 [core] autocrlf = input - pager = delta + pager = delta excludesfile = {{ .chezmoi.homeDir }}/.gitignore [diff] - colorMoved = default - tool = difftastic - -[difftool] - prompt = false - -[difftool "difftastic"] - cmd = difft "$LOCAL" "$REMOTE" - -[delta] - plus-color = "#012800" - minus-color = "#340001" - syntax-theme = Monokai Extended - line-numbers = true - side-by-side = true - inspect-raw-lines = false + colorMoved = default + tool = difftastic [pager] - difftool = true + difftool = true [pull] - rebase = true + rebase = true + +[difftool] + prompt = false + +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" + +[delta] + plus-color = "#012800" + minus-color = "#340001" + syntax-theme = Monokai Extended + line-numbers = true + side-by-side = true + inspect-raw-lines = false + +[pager] + difftool = true + +[pull] + rebase = true [push] autoSetupRemote = true [interactive] - diffFilter = delta --color-only + diffFilter = delta --color-only [alias] - dft = difftool - + dft = difftool [credential] helper = rbw @@ -56,9 +61,9 @@ required = true [filter "age"] - clean = git-age clean -- %f - smudge = git-age smudge -- %f - required = true + clean = git-age clean -- %f + smudge = git-age smudge -- %f + required = true [diff "age"] - textconv = cat + textconv = cat