From 9d43525d455eb506ce5292503785f580a83d2c35 Mon Sep 17 00:00:00 2001 From: Julian Torres Date: Mon, 24 Jun 2024 17:05:06 -0400 Subject: [PATCH] feat(git): update gitconfig --- .gitconfig | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitconfig b/.gitconfig index 6cf0540..c0b81eb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -21,10 +21,9 @@ reflog = delta show = delta [interactive] - diffFilter = delta --color-only --features=interactive + diffFilter = delta --color-only --features=interactive --tabs=4 --dark [diff] colorMoved = default - tool = Kaleidoscope [init] defaultBranch = main [filter "lfs"] @@ -39,6 +38,7 @@ features = decorations line-numbers = true syntax-theme = Monokai Extended Bright + dark = true [delta "interactive"] keep-plus-minus-markers = false [delta "decorations"] @@ -90,20 +90,17 @@ gpgsign = true [rebase] updateRefs = true -[difftool "Kaleidoscope"] - cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [difftool] prompt = false trustExitCode = true -[mergetool "Kaleidoscope"] - cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot - trustExitCode = true [mergetool] prompt = false +[rerere] + enabled = true [credential] helper = helper = /usr/local/share/gcm-core/git-credential-manager [credential "https://dev.azure.com"] useHttpPath = true -[rerere] - enabled = true +[credential "https://github.com"] + username = macintacos