pivotal-github 0.6.7 → 0.6.8
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +2 -2
- data/lib/pivotal-github/version.rb +1 -1
- metadata +2 -2
data/README.md
CHANGED
@@ -66,7 +66,7 @@ Additionall, `git story-push` accepts any options valid for `git push`.
|
|
66
66
|
$ git pull
|
67
67
|
$ git checkout 6283185-add-markdown-support
|
68
68
|
|
69
|
-
The purpose of `git story-pull`
|
69
|
+
The purpose of `git story-pull` is to prepare the local story branch for rebasing against `master`:
|
70
70
|
|
71
71
|
$ git story-pull
|
72
72
|
$ git rebase master
|
@@ -99,7 +99,7 @@ Note that this effectively changes the default merge behavior from fast-forward
|
|
99
99
|
|
100
100
|
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.
|
101
101
|
|
102
|
-
Because of the way options are chained, passing
|
102
|
+
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`.
|
103
103
|
|
104
104
|
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.
|
105
105
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pivotal-github
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.8
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-02-
|
12
|
+
date: 2013-02-17 00:00:00.000000000 Z
|
13
13
|
dependencies: []
|
14
14
|
description: Add commands for Pivotal Tracker–GitHub integration
|
15
15
|
email:
|