diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-11-17 18:52:18 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-11-17 18:52:18 +0200 |
commit | 5eafdf03dbe44684a2d60eda78a9d09901c50947 (patch) | |
tree | cbedf9d650226150eea033baa7978fe93887b516 | |
parent | 272b9814476eda287c52116a53f428e6cb63c578 (diff) | |
download | liw-ci-5eafdf03dbe44684a2d60eda78a9d09901c50947.tar.gz |
merge, don't rebase
Sponsored-by: author
-rw-r--r-- | ci-prod.ick | 1 |
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 |