Rebase

2017-07-25 00:51:59 +01:00 · 2017-07-25 00:51:59 +01:00 · 145243c64a
parent b82f39d804
commit 145243c64a
1 changed files with 1 additions and 0 deletions
--- a/publish.sh
+++ b/publish.sh
@ -24,6 +24,7 @@ touch output_${SITE_ENV}/.nojekyll
 cd output_${SITE_ENV}
 mv ../.git .
 git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
+git pull --rebase
 git add --all .
 git commit -m "Re-generate site. $SHA"
 git push $SSH_REPO $TARGET_BRANCH