diff options
| author | Lars Wirzenius <liw@liw.fi> | 2022-01-11 12:15:54 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2022-01-11 12:15:54 +0200 |
| commit | 06501998e700030d9a36146941dd727d3454a7ae (patch) | |
| tree | e071d07ef652b2067032135bab17a1a5ce07212b | |
| parent | fb3cd26af3a2ca9e347ac7837a15fc6bf69ea3cf (diff) | |
| download | liw-ci-06501998e700030d9a36146941dd727d3454a7ae.tar.gz | |
sequoia: rebase on main
Sponsored-by: author
| -rw-r--r-- | ci-prod.ick | 4 |
1 files changed, 3 insertions, 1 deletions
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 |