mirror of
https://github.com/sinbad/UEScripts.git
synced 2025-02-23 13:15:23 +00:00
Stop prompting for the merge message
This commit is contained in:
parent
b9b9c25915
commit
b033423a8c
@ -83,7 +83,9 @@ try {
|
|||||||
|
|
||||||
# Stopped using rebase because it's a PITA when it goes wrong
|
# Stopped using rebase because it's a PITA when it goes wrong
|
||||||
Write-Output "Pulling latest from Git..."
|
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) {
|
if ($LASTEXITCODE -ne 0) {
|
||||||
Write-Output "ERROR: git pull failed!"
|
Write-Output "ERROR: git pull failed!"
|
||||||
exit 5
|
exit 5
|
||||||
|
Loading…
x
Reference in New Issue
Block a user