README.md in pivotal-github-0.6.6 vs README.md in pivotal-github-0.6.7
- old
+ new
@@ -99,17 +99,17 @@
In addition, the `--log` option puts the commit messages from the individual commits in the merge message, which arranges for the merge commit itself to appear in the activity log at Pivotal Tracker. This is especially useful for viewing the full diff represented by the commit.
Because of the way options are chained, passing `--ff` or `--no-log` to `git story-merge` will override the `--no-ff` or `--log` flags (respectively) and thus restore the default behavior of `git merge`.
-Finally, experience shows that it's easy to forget to mark a story finished when making the final commit. As a reminder, the `git story-merge` command exits with a warning if the most recent commit doesn't contain 'Finishes' or 'Delivers' (or 'Finished', 'Delivered', 'Fixes', or 'Fixed'). This behavior can be overriden with the `--run` option. (I wanted to use `-f` and `--force`, but those interact badly with the default `git merge` options.)
+Finally, experience shows that it's easy to forget to mark a story finished when making the final commit. As a reminder, the `git story-merge` command exits with a warning if the most recent commit doesn't contain 'Finishes' or 'Delivers' (or 'Finished', 'Delivered', 'Fixes', or 'Fixed'). This behavior can be overriden with the `--force` option.
#### Options
Usage: git story-merge [options]
-d, --development BRANCH development branch (defaults to master)
- -r, --run run without marking story finished
+ -f, --force override unfinished story warning
-h, --help this usage guide
Additionally, `git story-merge` accepts any options valid for `git merge`.
### git story-pull-request
@@ -123,10 +123,10 @@
As with `git story-merge`, by default `git story-pull-request` exits with a warning if the most recent commit doesn't finish the story.
#### Options
Usage: git story-pull-request [options]
- -r, --run run without marking story finished
+ -f, --force override unfinished story warning
-s, --skip skip `git story-push`
-h, --help this usage guide
### story-open