diff options
| author | makefu <github@syntax-fehler.de> | 2018-09-10 17:32:31 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-09-10 17:32:31 +0200 |
| commit | 859f98583788a9324be0e8c52d36a6bb812273fe (patch) | |
| tree | 81e1ce4bd2a4185221761165023434f8737fff06 /krebs/3modules/konsens.nix | |
| parent | b2a3bd38ea70307c8b136eba42de7cc882afd441 (diff) | |
| parent | f6e69c6ecb25fc96655ec1749747d9ccb7880365 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/konsens.nix')
| -rw-r--r-- | krebs/3modules/konsens.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/krebs/3modules/konsens.nix b/krebs/3modules/konsens.nix index 47316d5d6..74895a971 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"; |