From 06501998e700030d9a36146941dd727d3454a7ae Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Tue, 11 Jan 2022 12:15:54 +0200
Subject: sequoia: rebase on main

Sponsored-by: author
---
 ci-prod.ick | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci-prod.ick b/ci-prod.ick
index 2ac94a4..0aba602 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1301,6 +1301,8 @@ pipelines:
       - where: container
         shell: |
           cd src
+          git config --local user.name Ick
+          git config --local user.email liw@liw.fi
           git branch -a
           git checkout liw/debian
-          git merge --ff --no-commit
+          git rebase main
-- 
cgit v1.2.1