From 5aaa632965664913ab83c0bfb937ee3d6f3ddc1c Mon Sep 17 00:00:00 2001
From: Sjur N Moshagen <sjurnm@mac.com>
Date: Fri, 10 Jan 2025 08:23:44 +0200
Subject: [PATCH] =?UTF-8?q?Ensure=20we=20use=20git=20pull=20=E2=80=94rebas?=
 =?UTF-8?q?e=20when=20running=20helper=20script?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devtools/update-this-lang.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devtools/update-this-lang.bash b/devtools/update-this-lang.bash
index 58ec2348..34a4119c 100755
--- a/devtools/update-this-lang.bash
+++ b/devtools/update-this-lang.bash
@@ -10,7 +10,7 @@ if ! test -f configure.ac ; then
     exit 1
 fi
 
-git pull || exit 1
+git pull --rebase || exit 1
 
 function clone_or_pull_and_make_local() {
     if test -z "$1" ; then
@@ -27,7 +27,7 @@ function clone_or_pull_and_make_local() {
         popd || return 1
     else
         pushd "../$1" || return 1
-        git pull -q || return 1
+        git pull --rebase -q || return 1
         ./autogen.sh || return 1
         if test -x config.status ; then
             ./config.status || return 1
@@ -55,7 +55,7 @@ do
     clone_or_pull_and_make_local "$ll" || didnt_work "$ll"
 done
 
-git pull -q || didnt_work "git pull"
+git pull --rebase -q || didnt_work "git pull"
 ./autogen.sh || didnt_work "autogen.sh"
 if test -x config.status ; then
     ./config.status || didnt_work "config.status"