Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source 
Conflicts:
	Gruntfile.coffee
This commit is contained in:
ccd0 2015-03-06 19:02:33 -08:00
commit 5a88ebea5e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gruntfile.coffee
View File

@ -143,7 +143,6 @@ module.exports = (grunt) ->
""".split('\n').join('&&') """.split('\n').join('&&')
beta: beta:
command: """ command: """
git fetch --tags
git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout gh-pages git checkout gh-pages
git pull git pull
@ -154,7 +153,6 @@ module.exports = (grunt) ->
""".split('\n').join('&&') """.split('\n').join('&&')
stable: stable:
command: """ command: """
git fetch --tags
git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout gh-pages git checkout gh-pages
git pull git pull
@ -168,7 +166,6 @@ module.exports = (grunt) ->
command: 'git commit -am "Build web page."' command: 'git commit -am "Build web page."'
web: web:
command: """ command: """
git fetch --tags
git checkout gh-pages git checkout gh-pages
git pull git pull
git merge --no-commit -s ours - git merge --no-commit -s ours -