summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-11-17 18:51:27 +0200
committerLars Wirzenius <liw@liw.fi>2021-11-17 18:51:27 +0200
commit272b9814476eda287c52116a53f428e6cb63c578 (patch)
treeb95fceb7128224164476da6b547f85fb9ec37c21
parentd62e1049e2dcc4fe68fa3fadd9fdd655f62ae391 (diff)
downloadliw-ci-272b9814476eda287c52116a53f428e6cb63c578.tar.gz
rebase_liw_debian_on_main: merge, don't rebase
Sponsored-by: author
-rw-r--r--ci-prod.ick1
1 files changed, 0 insertions, 1 deletions
diff --git a/ci-prod.ick b/ci-prod.ick
index fa2c338..ed3005e 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1257,4 +1257,3 @@ pipelines:
cd src
git branch -a
git checkout liw/debian
- git rebase main