lib/pivotal-github/story_merge.rb in pivotal-github-0.6.1 vs lib/pivotal-github/story_merge.rb in pivotal-github-0.6.2
- old
+ new
@@ -19,10 +19,10 @@
# For example:
# git checkout master
# 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(' ')
lines.join("\n")
end
\ No newline at end of file