floppydiscen/git-workshop
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: setup merge and diff for git

Browse Source
This commit is contained in:
Bjarke Sporring
2026-01-15 14:07:25 +01:00
parent 0183a06134
commit f0522e14bc
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
install.ps1
View File

@@ -636,9 +636,20 @@ if ($userChoice -ne "CloneOnly") {
-MinVersion "2.23" ` -MinVersion "2.23" `
-AdditionalArgs "-e" -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 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 # Verify Git version specifically
if ($results.Git) { if ($results.Git) {
if (-not (Test-GitVersion)) { if (-not (Test-GitVersion)) {