Merge branch 'master' of https://github.com/rschamp/gh-pages into pr/71

# Conflicts:
#	package.json
This commit is contained in:
Ray Schamp 2016-10-19 22:23:18 -04:00
commit 15d8918ec2
2 changed files with 9 additions and 6 deletions

View file

@ -19,6 +19,8 @@ program
'The name of the remote', 'origin')
.option('-m, --message <message>',
'commit message', 'Updates')
.option('-g, --tag <tag>',
'add tag to commit')
.option('-t, --dotfiles', 'Include dotfiles')
.option('-a, --add', 'Only add, and never remove existing files.')
.option('-v, --remove <pattern>',
@ -33,6 +35,7 @@ ghpages.publish(path.join(process.cwd(), program.dist), {
branch: program.branch,
src: program.src,
message: program.message,
tag: program.tag,
dotfiles: !!program.dotfiles,
add: !!program.add,
only: program.remove,

View file

@ -26,19 +26,19 @@
"test": "mocha --recursive test"
},
"dependencies": {
"async": "1.5.2",
"async": "2.1.2",
"commander": "2.9.0",
"globby": "^4.0.0",
"graceful-fs": "4.1.2",
"globby": "^5.0.0",
"graceful-fs": "4.1.6",
"q": "1.4.1",
"q-io": "1.13.2",
"rimraf": "^2.5.2"
},
"devDependencies": {
"chai": "^3.4.1",
"eslint": "2.8.0",
"eslint-config-tschaub": "4.0.0",
"mocha": "^2.3.4",
"eslint": "3.8.0",
"eslint-config-tschaub": "5.0.0",
"mocha": "^3.1.1",
"sinon": "^1.17.3"
},
"bin": {