chg: pull --rebase the branches of interest, this should avoid issues with modified...

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index 9b006cd1b899b07b9bd46f2c2560cadc15beb6bf..cca3ed7e5f35eac74298d339ff4b0c671e1df6e4 100644 (file)
--- a/EximBuild/SCM.pm
+++ b/EximBuild/SCM.pm
@@ -222,7 +222,7 @@ sub checkout
             unshift @branches,"Missing checked out branch bf_$branch in " . cwd() . ":\n";
             main::send_result("$target-Git",$status,\@branches);
         }
             unshift @branches,"Missing checked out branch bf_$branch in " . cwd() . ":\n";
             main::send_result("$target-Git",$status,\@branches);
         }

-        my @pulllog = `git pull 2>&1`;
+        my @pulllog = `git pull --rebase 2>&1`;

         push(@gitlog,@pulllog);
         chdir '..';
     }
         push(@gitlog,@pulllog);
         chdir '..';
     }