From 7819c9cb95a037b5ed2f91dfba5bbef642358f16 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Mon, 9 Oct 2023 18:40:44 +0200
Subject: [PATCH] chg: pull --rebase the branches of interest, this should
 avoid issues with modified history

---
 EximBuild/SCM.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EximBuild/SCM.pm b/EximBuild/SCM.pm
index 9b006cd..cca3ed7 100644
--- 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);
         }
-        my @pulllog = `git pull 2>&1`;
+        my @pulllog = `git pull --rebase 2>&1`;
         push(@gitlog,@pulllog);
         chdir '..';
     }
-- 
2.30.2