mirror of
				https://github.com/rschamp/gh-pages.git
				synced 2025-11-04 12:51:11 +08:00 
			
		
		
		
	Merge branch 'master' into pr/71
This commit is contained in:
		
						commit
						1be63c5ea9
					
				@ -1,6 +1,10 @@
 | 
			
		||||
language: node_js
 | 
			
		||||
node_js:
 | 
			
		||||
  - "4"
 | 
			
		||||
  - "6"
 | 
			
		||||
 | 
			
		||||
cache:
 | 
			
		||||
  directories:
 | 
			
		||||
    - node_modules
 | 
			
		||||
 | 
			
		||||
branches:
 | 
			
		||||
  only:
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										20
									
								
								changelog.md
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								changelog.md
									
									
									
									
									
								
							@ -1,3 +1,23 @@
 | 
			
		||||
## v0.12.0
 | 
			
		||||
 | 
			
		||||
 * [#146](https://github.com/tschaub/gh-pages/pull/146) - Updates dependencies ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#138](https://github.com/tschaub/gh-pages/pull/138) - Updated readme.md with svg image ([@sobolevn](https://github.com/sobolevn))
 | 
			
		||||
 * [#142](https://github.com/tschaub/gh-pages/pull/142) - Update globby to version 6.1.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#134](https://github.com/tschaub/gh-pages/pull/134) - Update eslint to version 3.8.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#135](https://github.com/tschaub/gh-pages/pull/135) - Update async to version 2.1.2 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#130](https://github.com/tschaub/gh-pages/pull/130) - Update mocha to version 3.1.1 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#112](https://github.com/tschaub/gh-pages/pull/112) - Update graceful-fs to version 4.1.6 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#106](https://github.com/tschaub/gh-pages/pull/106) - Add a --tag option to the cli ([@donavon](https://github.com/donavon))
 | 
			
		||||
 * [#102](https://github.com/tschaub/gh-pages/pull/102) - Update graceful-fs to version 4.1.5 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#89](https://github.com/tschaub/gh-pages/pull/89) - Update globby to version 5.0.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#87](https://github.com/tschaub/gh-pages/pull/87) - Update eslint-config-tschaub to version 5.0.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#78](https://github.com/tschaub/gh-pages/pull/78) - Use rimraf for cleaning ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#75](https://github.com/tschaub/gh-pages/pull/75) - Expose a "remove" option to the CLI ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#76](https://github.com/tschaub/gh-pages/pull/76) - Update eslint to version 2.8.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#70](https://github.com/tschaub/gh-pages/pull/70) - Update eslint to version 2.7.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#63](https://github.com/tschaub/gh-pages/pull/63) - Update eslint to version 2.4.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 * [#62](https://github.com/tschaub/gh-pages/pull/62) - Update eslint to version 2.3.0 🚀 ([@tschaub](https://github.com/tschaub))
 | 
			
		||||
 | 
			
		||||
## v0.11.0
 | 
			
		||||
 | 
			
		||||
  * [#61](https://github.com/tschaub/gh-pages/pull/61) - Support a custom remote. ([@marco-c](https://github.com/marco-c))
 | 
			
		||||
 | 
			
		||||
@ -99,8 +99,7 @@ exports.clone = function clone(repo, dir, branch, options) {
 | 
			
		||||
      return Q.resolve();
 | 
			
		||||
    } else {
 | 
			
		||||
      return fs.makeTree(path.dirname(path.resolve(dir))).then(function() {
 | 
			
		||||
        var args = ['clone', repo, dir, '--branch', branch, '--single-branch',
 | 
			
		||||
                    '--origin', options.remote];
 | 
			
		||||
        var args = ['clone', repo, dir, '--branch', branch, '--single-branch', '--origin', options.remote];
 | 
			
		||||
        if (options.depth) {
 | 
			
		||||
          args.push('--depth', options.depth);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										16
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								package.json
									
									
									
									
									
								
							@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "gh-pages",
 | 
			
		||||
  "version": "0.11.0",
 | 
			
		||||
  "version": "0.12.0",
 | 
			
		||||
  "description": "Publish to a gh-pages branch on GitHub (or any other branch on any other remote)",
 | 
			
		||||
  "keywords": [
 | 
			
		||||
    "git",
 | 
			
		||||
@ -28,17 +28,17 @@
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "async": "2.1.2",
 | 
			
		||||
    "commander": "2.9.0",
 | 
			
		||||
    "globby": "^5.0.0",
 | 
			
		||||
    "graceful-fs": "4.1.6",
 | 
			
		||||
    "globby": "^6.1.0",
 | 
			
		||||
    "graceful-fs": "4.1.10",
 | 
			
		||||
    "q": "1.4.1",
 | 
			
		||||
    "q-io": "1.13.2",
 | 
			
		||||
    "rimraf": "^2.5.2"
 | 
			
		||||
    "rimraf": "^2.5.4"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "chai": "^3.4.1",
 | 
			
		||||
    "eslint": "3.8.0",
 | 
			
		||||
    "eslint-config-tschaub": "5.0.0",
 | 
			
		||||
    "mocha": "^3.1.1",
 | 
			
		||||
    "chai": "^3.5.0",
 | 
			
		||||
    "eslint": "^3.10.2",
 | 
			
		||||
    "eslint-config-tschaub": "^6.0.0",
 | 
			
		||||
    "mocha": "^3.1.2",
 | 
			
		||||
    "sinon": "^1.17.3"
 | 
			
		||||
  },
 | 
			
		||||
  "bin": {
 | 
			
		||||
 | 
			
		||||
@ -64,7 +64,7 @@ ghpages.publish(path.join(__dirname, 'build'), callback);
 | 
			
		||||
 | 
			
		||||
### Options
 | 
			
		||||
 | 
			
		||||
The default options work for simple cases cases.  The options described below let you push to alternate branches, customize your commit messages, and more.
 | 
			
		||||
The default options work for simple cases.  The options described below let you push to alternate branches, customize your commit messages, and more.
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#### <a id="optionssrc">options.src</a>
 | 
			
		||||
@ -321,4 +321,4 @@ npm run deploy
 | 
			
		||||
 | 
			
		||||
Note that this plugin requires Git 1.7.6 or higher (because it uses the `--exit-code` option for `git ls-remote`).  If you'd like to see this working with earlier versions of Git, please [open an issue](https://github.com/tschaub/gh-pages/issues).
 | 
			
		||||
 | 
			
		||||
[](https://travis-ci.org/tschaub/gh-pages)
 | 
			
		||||
[](https://travis-ci.org/tschaub/gh-pages)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user