From b033423a8c626f42a381a10f958ed2d82a715797 Mon Sep 17 00:00:00 2001 From: Steve Streeting Date: Tue, 19 Nov 2024 18:14:37 +0000 Subject: [PATCH] Stop prompting for the merge message --- ue-get-latest.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ue-get-latest.ps1 b/ue-get-latest.ps1 index 870400d..e422018 100644 --- a/ue-get-latest.ps1 +++ b/ue-get-latest.ps1 @@ -83,7 +83,9 @@ try { # Stopped using rebase because it's a PITA when it goes wrong Write-Output "Pulling latest from Git..." - git pull --recurse-submodules + # I know Linus says we shouldn't accept the default merge message but pfft + # No artist wan't to see that git merge message pop-up, come on, it's obvious why + git pull --recurse-submodules --no-edit if ($LASTEXITCODE -ne 0) { Write-Output "ERROR: git pull failed!" exit 5