aboutsummaryrefslogtreecommitdiffstats
path: root/tool/merger.rb
Commit message (Collapse)AuthorAgeFilesLines
* * tool/merger.rb (interactive): allow editing commit message.nobu2012-03-261-6/+7
| | | | 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.nobu2012-03-261-11/+6
| | | | 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 usednaruse2012-02-171-1/+1
| | | | | | when the commit doesn't change ChangeLog. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (#default_merge_branch): Add support forknu2012-02-121-1/+1
| | | | | | | | | Subversion 1.7 which adopted a whole new working directory structure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: don't abort, update first.naruse2012-02-081-5/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: abort if the working directory is dirty.naruse2012-02-061-0/+6
| | | | | | * tool/merger.rb: update the working directory after commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: allow r0123 style revision number.kosaki2012-01-031-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (#version_up): version.h date should be Japanesekosaki2012-01-031-1/+2
| | | | | | | | locale date. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Forgot content of r29049.naruse2010-08-191-0/+207
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e