summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-11-17 18:52:18 +0200
committerLars Wirzenius <liw@liw.fi>2021-11-17 18:52:18 +0200
commit5eafdf03dbe44684a2d60eda78a9d09901c50947 (patch)
treecbedf9d650226150eea033baa7978fe93887b516
parent272b9814476eda287c52116a53f428e6cb63c578 (diff)
downloadliw-ci-5eafdf03dbe44684a2d60eda78a9d09901c50947.tar.gz
merge, don't rebase
Sponsored-by: author
-rw-r--r--ci-prod.ick1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci-prod.ick b/ci-prod.ick
index ed3005e..cf3d4e6 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1257,3 +1257,4 @@ pipelines:
cd src
git branch -a
git checkout liw/debian
+ git merge --ff --no-commit