From 695cef6cb336e3145de7961bfc7479d6227a4332 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Fri, 23 May 2025 12:08:05 -0700 Subject: [PATCH] Cleanup gitconfig --- dotfiles/gitconfig | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index f806c0a..a5a5200 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -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