From da067694cc9ad8deccb9b15c9146dfb01baf3f9e Mon Sep 17 00:00:00 2001 From: Prototik Date: Sat, 24 Oct 2015 21:17:35 +0700 Subject: [PATCH] Fix backport merging --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 048c4b1..ede857c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ Merge master into backport-1448: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=master - to=backport-1448 - - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git + - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to - git reset --hard origin/$to @@ -50,7 +50,7 @@ Merge backport-1448 into backport-1388: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=backport-1448 - to=backport-1388 - - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git + - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to - git reset --hard origin/$to @@ -68,7 +68,7 @@ Merge backport-1388 into backport-1370: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=backport-1388 - to=backport-1370 - - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git + - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to - git reset --hard origin/$to @@ -86,7 +86,7 @@ Merge backport-1370 into backport-1291: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=backport-1370 - to=backport-1291 - - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git + - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to - git reset --hard origin/$to @@ -104,7 +104,7 @@ Merge backport-1291 into backport-1240: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=backport-1291 - to=backport-1240 - - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git + - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to - git reset --hard origin/$to