From af688c1862ed44514394cc97061ddb3b31bc15e9 Mon Sep 17 00:00:00 2001 From: Jared Date: Tue, 2 Aug 2016 15:57:56 -0700 Subject: [PATCH] Update travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28808dcfd6..32a60e04ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ script: - git config --global user.name "${GIT_NAME}" - git clone https://${GIT_USERNAME}:${GH_TOKEN}@github.com/kubernetes-v1-4/kubernetes-v1-4.github.io.git - cd kubernetes-v1-4.github.io -- git remote add --fetch --track release-1.3 homebase "https://${GIT_USERNAME}:${GH_TOKEN}@github.com/kubernetes/kubernetes.github.io.git" +- git remote add --fetch --track release-1.4 homebase "https://${GIT_USERNAME}:${GH_TOKEN}@github.com/kubernetes/kubernetes.github.io.git" - git merge -s recursive -X theirs homebase/release-1.4 -m "Sync from homebase" - git push env: