pivotal-github 0.6.1 → 0.6.2

data/README.md

@@ -91,13 +91,15 @@ Additionally, `git story-pull` accepts any options valid for `git pull`.
 `git story-merge` merges the current branch into `master`. On a branch called `6283185-add-markdown-support`, `git story-merge` is equivalent to the following: 
 
     $ git checkout master
-    $ git merge --no-ff 6283185-add-markdown-support
+    $ git merge --no-ff --log 6283185-add-markdown-support
 
 Note that this effectively changes the default merge behavior from fast-forward to no-fast-forward, which makes it possible to see from `git log` which of the commit objects together have implemented a story. As noted in [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/),
 
 > 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.
 
-Because of the way options are chained, passing the option `--ff` to `git story-merge` will override the `--no-ff` flag and restore the fast-forward behavior.
+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`.
 
 #### Options
 

data/lib/pivotal-github/story_merge.rb

@@ -21,7 +21,7 @@ class StoryMerge < Command
   #   git merge --no-ff <story branch>
   def cmd
     lines = ["git checkout #{development_branch}"]
-    c = ['git merge --no-ff']
+    c = ['git merge --no-ff --log']
     c << argument_string(unknown_options) unless unknown_options.empty?
     c << story_branch
     lines << c.join(' ')

data/lib/pivotal-github/version.rb

@@ -1,5 +1,5 @@
 module Pivotal
   module Github
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/spec/commands/story_merge_spec.rb

@@ -17,7 +17,7 @@ describe StoryMerge do
 
   describe "with no options" do
     its(:cmd) { should =~ /git checkout master/ }
-    its(:cmd) { should =~ /git merge --no-ff #{command.story_branch}/ }
+    its(:cmd) { should =~ /git merge --no-ff --log #{command.story_branch}/ }
   end
 
   describe "with a custom development branch" do
@@ -34,6 +34,6 @@ describe StoryMerge do
   describe "command-line command" do
     subject { `bin/git-story-merge --debug -ff -d develop` }
     it { should =~ /git checkout develop/ }
-    it { should =~ /git merge --no-ff -ff/ }
+    it { should =~ /git merge --no-ff --log -ff/ }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pivotal-github
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Add commands for Pivotal Tracker–GitHub integration
 email: