README.md in pivotal-github-0.6.7 vs README.md in pivotal-github-0.6.8

- old
+ new

@@ -64,11 +64,11 @@ $ git checkout master $ git pull $ git checkout 6283185-add-markdown-support -The purpose of `git story-pull` it to prepare the local story branch for rebasing against `master`: +The purpose of `git story-pull` is to prepare the local story branch for rebasing against `master`: $ git story-pull $ git rebase master (This is essentially equivalent to @@ -97,10 +97,10 @@ > The `--no-ff` flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the featureā€¦ Yes, it will create a few more (empty) commit objects, but the gain is much bigger that that cost. 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`. +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 `--force` option. #### Options