tony/dotfiles
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Git config cleanup done

Browse Source
This commit is contained in:
Tony Miller 2025-08-21 23:00:49 +10:00
parent 09363311c9
commit 664c3518d2
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.config/git/config
View File

@ -26,16 +26,11 @@
autoSetupRemote = true autoSetupRemote = true
# Diffs and Merges {{{ # Diffs and Merges {{{
[diff]
tool = Kaleidoscope
[difftool] [difftool]
prompt = false prompt = false
trustExitCode = true trustExitCode = true
[merge]
tool = Kaleidoscope
[mergetool] [mergetool]
prompt = false prompt = false
conflictstyle = diff3 conflictstyle = diff3