ruby.git/tool/merger.rb, branch v2_0_0_451

merge revision(s) 39425:

2013-03-09T13:55:21+00:00

	merger.rb: runnable

	* tool/merger.rb: make runnable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 39424:

2013-03-09T13:54:25+00:00

	merger.rb: suppress warnings

	* tool/merger.rb (version_up, tag, default_merge_branch): suppress
  syntax warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 39358:

2013-03-04T16:22:15+00:00

	* tool/merger.rb: add interaction when only ChangeLog is modified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb: typo.

2012-11-09T15:42:55+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb: add feature to tag preview/rc.

2012-11-01T19:24:21+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb: now can merge revision(s) without --ticket again.

2012-10-12T07:07:10+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb: add --ticket option to add ticket number.

2012-09-24T02:23:48+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb (interactive): allow editing commit message.

2012-03-26T03:57:07+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb (default_merge_branch): use IO.popen to invoke pager.

2012-03-26T03:57:03+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* tool/merger.rb: remove borders from the commit message which is used

2012-02-17T03:37:44+00:00

  when the commit doesn't change ChangeLog.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e