Skip to content

Commit

Permalink
feat(git): update gitconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
macintacos committed Jun 24, 2024
1 parent e3cae8a commit 9d43525
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"]
Expand Down Expand Up @@ -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

0 comments on commit 9d43525

Please sign in to comment.