From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 29 Jul 2024 08:51:09 +0000 (+0200)
Subject: wait #7004 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=164b8845fa66747d931668a803e05cd885ae88e5;p=cubist_util.git

wait #7004 @0.5
---

diff --git a/src/CommandLine/Git.php b/src/CommandLine/Git.php
index e907454..e5f9f7f 100644
--- a/src/CommandLine/Git.php
+++ b/src/CommandLine/Git.php
@@ -70,8 +70,10 @@ class Git extends CommandLine
     {
         $args = '';
         if ($rebase) {
+            self::executeCommand($repos, 'stash', $debug);
             $args .= '--rebase';
         }
+
         $res = self::executeCommand($repos, 'pull ' . $args, $debug);
         $changes = (trim($res) !== 'Already up to date.');
         if ($restoreMtime && $changes) {