fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-05-30 15:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change merge and diff tool for git on workstation

Browse Source
This commit is contained in:
Fabio Scotto di Santolo
2026-05-28 14:54:07 +02:00
parent e6467017d9
commit 7327bab7f2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/templates/workstation/.gitconfig.j2
View File

@@ -24,13 +24,19 @@
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
tool = meld tool = vscode
[mergetool] [mergetool]
prompt = false prompt = false
[mergetool "vscode"]
cmd = code --reuse-window --wait $MERGED
[diff] [diff]
tool = meld tool = vscode
[difftool "vscode"]
cmd = code --reuse-window --wait --diff $LOCAL $REMOTE
[color] [color]
ui = always ui = always