From 136d7c2f41815eaa51221bfd13c7ff514a39ed73 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 8 Sep 2018 21:26:03 +0200
Subject: konsens: handle >2 commits

---
 krebs/3modules/konsens.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/konsens.nix')

diff --git a/krebs/3modules/konsens.nix b/krebs/3modules/konsens.nix
index 47316d5d..74895a97 100644
--- a/krebs/3modules/konsens.nix
+++ b/krebs/3modules/konsens.nix
@@ -68,7 +68,7 @@ let
             fi
             cd ${name}
             git fetch origin
-            git push origin $(git merge-base ${concatMapStringsSep " " (branch: "origin/${branch}") repo.branchesToCheck}):refs/heads/master
+            git push origin $(git merge-base --octopus ${concatMapStringsSep " " (branch: "origin/${branch}") repo.branchesToCheck}):refs/heads/master
           '';
           WorkingDirectory = /var/lib/konsens;
           User = "konsens";
-- 
cgit v1.2.3