mirror of
https://github.com/sinbad/UEScripts.git
synced 2025-02-23 13:15:23 +00:00
Stop using rebase in the get latest script
This commit is contained in:
parent
31885b6032
commit
c82c10b362
@ -80,9 +80,9 @@ try {
|
||||
# Use Invoke-Expression so we can use a string as options
|
||||
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
|
||||
|
||||
# Use rebase pull to keep simpler
|
||||
# Stopped using rebase because it's a PITA when it goes wrong
|
||||
Write-Output "Pulling latest from Git..."
|
||||
git pull --rebase --recurse-submodules
|
||||
git pull --recurse-submodules
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Write-Output "ERROR: git pull failed!"
|
||||
exit 5
|
||||
|
Loading…
x
Reference in New Issue
Block a user