From 0461c2607eb593da43f1303d23f44232d8c345ca Mon Sep 17 00:00:00 2001 From: ccd0 Date: Mon, 29 Dec 2014 12:12:23 -0800 Subject: [PATCH] Gruntfile: Fix overwriting of web page images. --- Gruntfile.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index dab07031b..ecbc293ef 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -152,7 +152,7 @@ module.exports = (grunt) -> git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git checkout -b tmp git merge --no-commit -s ours gh-pages - git checkout gh-pages "builds/*<%= pkg.meta.suffix.beta %>.*" README.md template.jst index.html + git checkout gh-pages "builds/*<%= pkg.meta.suffix.beta %>.*" README.md template.jst index.html img git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to stable channel." git checkout gh-pages git merge --ff-only tmp @@ -163,7 +163,7 @@ module.exports = (grunt) -> command: """ git commit -am "Build web page." git checkout gh-pages - git checkout - README.md template.jst index.html + git checkout - README.md template.jst index.html img git commit -am "Update web page." git checkout - """.split('\n').join('&&')