wait #7004 @0.5

diff --git a/src/CommandLine/Git.php b/src/CommandLine/Git.php
index e9074549953494e3c41620bfd614e12a642caf53..e5f9f7f62b05695363ec791c68251197ad72a81e 100644 (file)
--- 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) {