Comparing version 2.0.0 to 2.1.0
{ | ||
"name": "git-land", | ||
"version": "2.0.0", | ||
"version": "2.1.0", | ||
"description": "Merges a pull request or topic branch via rebasing to avoid a merge commit.", | ||
@@ -33,5 +33,5 @@ "main": "git-land", | ||
"bugs": { | ||
"url": "https://github.com/bazaarvoice/git-land/issues" | ||
"url": "https://github.com/git-land/git-land/issues" | ||
}, | ||
"homepage": "https://github.com/bazaarvoice/git-land" | ||
"homepage": "https://github.com/git-land/git-land" | ||
} |
@@ -25,4 +25,4 @@ # git-land | ||
``` | ||
git land [<remote>] <pull request number>[:<target>] | ||
git land [<remote>] <branch>[:<target>] | ||
git land [options] [<remote>] <pull request number>[:<target>] | ||
git land [options] [<remote>] <branch>[:<target>] | ||
``` | ||
@@ -39,2 +39,17 @@ | ||
### Options | ||
#### `-f, --force-push-topic`: force push rebased topic branch | ||
If this option is specified, `git-land` will force push the rebased topic branch | ||
request to the `remote` repository. [Pull request branches are | ||
read-only][read-only-pulls], so git-land exits with an error if invoked with a | ||
pull request number and this option specified. | ||
#### `-F, --no-force-push-topic`: do not force push rebased topic branch | ||
If this option is specified, `git-land` will not force push the rebased topic | ||
branch request to the `remote` repository, even if configured to do so by | ||
default. | ||
## Installation | ||
@@ -93,2 +108,13 @@ | ||
#### Whether to force push the topic branch | ||
By default, `git-land` does nothing with the topic branch after rebasing it | ||
locally. Specifying the `--force-push-topic` option overrides this behavior, | ||
force pushing the rebased topic branch to the target remote. To make this | ||
behavior the default, set the `git-land.force-push-topic` option to `true`: | ||
```sh | ||
git config git-land.force-push-topic true | ||
``` | ||
## Thanks | ||
@@ -109,3 +135,4 @@ | ||
Copyright 2015 Bazaarvoice, Inc. Licensed under Apache 2.0 | ||
Copyright 2015 Bazaarvoice, Inc., RetailMeNot, Inc., and git-land contributors | ||
Licensed under Apache 2.0 | ||
@@ -120,1 +147,3 @@ http://www.apache.org/licenses/LICENSE-2.0 | ||
[vvcephei]: https://github.com/vvcephei | ||
[read-only-pulls]: https://help.github.com/articles/checking-out-pull-requests-locally/#tips |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
21692
145