From f0522e14bcd2f89c886881f333416715284be667 Mon Sep 17 00:00:00 2001 From: Bjarke Sporring Date: Thu, 15 Jan 2026 14:07:25 +0100 Subject: [PATCH] feat: setup merge and diff for git --- install.ps1 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/install.ps1 b/install.ps1 index be28425..289f010 100644 --- a/install.ps1 +++ b/install.ps1 @@ -636,8 +636,19 @@ if ($userChoice -ne "CloneOnly") { -MinVersion "2.23" ` -AdditionalArgs "-e" - Write-Host "Setting the init.defaultBranch to be \"main\"" + Write-Host " Setting the init.defaultBranch to be 'main'" git config --global init.defaultBranch main + + Write-Host " Setting the default editor to code, to handle merge messages" + git config --global core.editor "code --wait" + + Write-Host " Setting vscode at the default code editor for merge conflicts" + git config --global merge.tool vscode + git config --global mergetool.vscode.cmd 'code --wait --merge $REMOTE $LOCAL $BASE $MERGED' + + Write-Host " Setting vscode as the default code editor for diffs" + git config --global diff.tool vscode + git config --global difftool.vscode.cmd 'code --wait --diff $LOCAL $REMOTE' # Verify Git version specifically if ($results.Git) {