From 420e6915df9dd4d6dc2ec5c42d7833232d0a2f09 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Thu, 8 Aug 2024 10:39:00 +0200
Subject: [PATCH] =?UTF-8?q?Vous=20avez=20des=20branches=20divergentes=20et?=
 =?UTF-8?q?=20vous=20devez=20sp=C3=A9cifier=20comment=20les=20r=C3=A9conci?=
 =?UTF-8?q?lier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/gerrit/one-way-sync.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/gerrit/one-way-sync.nix b/services/gerrit/one-way-sync.nix
index c8248c5..250b59f 100644
--- a/services/gerrit/one-way-sync.nix
+++ b/services/gerrit/one-way-sync.nix
@@ -29,7 +29,7 @@ let
       echo "Current ref: $EXPECTED_REF"
       git worktree add -f "$RUNTIME_DIRECTORY"/${name} refs/remotes/origin/${localRefspec}
       cd "$RUNTIME_DIRECTORY"/${name}
-      git pull origin ${localRefspec}
+      git pull origin ${localRefspec} --no-rebase
       EXPECTED_REF=$(git rev-list refs/remotes/origin/${localRefspec} | head -1)
       git config user.name Fork-o-Tron
       git config user.email noreply@forkos.org