diff --git a/ChangeLog b/ChangeLog index 459daef951..c71590bf27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 12 16:06:20 2012 NAKAMURA Usaku + + * tool/merger.rb: now can merge revision(s) without --ticket again. + Fri Oct 12 14:10:41 2012 Nobuyoshi Nakada * lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as diff --git a/tool/merger.rb b/tool/merger.rb index b7ceb86df3..d3bc0e9edc 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -131,6 +131,8 @@ else if /--ticket=(.*)/ =~ ARGV[0] tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"} ARGV.shift + else + tickets = [] end q = $repos + (ARGV[1] || default_merge_branch)