lib/rgitflow/tasks/feature/finish.rb in rgitflow-0.1.0 vs lib/rgitflow/tasks/feature/finish.rb in rgitflow-0.2.0.pre.alpha.pre.20
- old
+ new
@@ -19,10 +19,10 @@
error 'Cannot finish a feature branch unless you are in a feature branch'
abort
end
@git.branch(RGitFlow::Config.options[:develop]).checkout
- @git.merge branch
+ @git.merge branch, "merging #{branch} into #{RGitFlow::Config.options[:develop]}"
@git.push
if @git.is_remote_branch? branch
@git.push('origin', branch, {:delete => true})
end
\ No newline at end of file