ruby.git/tool/merger.rb, branch v3_3_11 The Ruby Programming Language Sync the latest version of backport tools 2026-03-24T05:49:12+00:00 Hiroshi SHIBATA hsbt@ruby-lang.org 2026-03-24T05:48:05+00:00 167e8d47bedfbc98dcf71607d1ab2000a696b2ae 






merger.rb: Put spaces in between revisions
2024-06-04T18:32:28+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-06-04T18:31:00+00:00

12c806acc3923115f2c6590c885e43f2f24a17e3

so that they are linked correctly on GitHub





so that they are linked correctly on GitHub







merger.rb: Don't ask "conflicts resolved?" if not needed
2024-05-29T00:46:44+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-05-29T00:45:21+00:00

0e96dd93c51337a01fa29b563c2d330c472b03b7












merger.rb: Auto-detect tickets when --ticket is not given
2024-05-28T23:30:45+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-05-28T23:28:00+00:00

239a8cc7d7c6cc60e5f32865ebfcd5e2f5c9c08d












merger.rb: Drop an obsoleted command from help
2024-05-28T22:54:54+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-05-28T22:42:47+00:00

90fda2da5f0d5841b80d7f8dca4b38aaf2a80f51

It was needed only for SVN, and we dropped SVN support.





It was needed only for SVN, and we dropped SVN support.







merger.rb: Improve the help message
2024-05-28T21:10:26+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-05-28T21:05:50+00:00

62f450285bbe1f8fbbaf12540d6538985234f3d8

It wasn't clear whether the backport command takes a commit hash or a
ticket number.





It wasn't clear whether the backport command takes a commit hash or a
ticket number.







Sync merger.rb from master
2024-05-28T20:53:43+00:00

Takashi Kokubun
takashikkbn@gmail.com

2024-05-28T20:53:43+00:00

c564c4a0992d15c4b1a2c395061c9a95bc060767












tool/merger.rb: Support commit URLs as revisions
2023-07-23T13:47:09+00:00

nagachika
nagachika@ruby-lang.org

2023-07-23T12:44:36+00:00

4dccb145a8d052220743a557de3bb82b037dbf82












Use 3 way merge for merger.rb
2023-03-28T07:57:55+00:00

NARUSE, Yui
naruse@airemix.jp

2023-03-28T05:25:31+00:00

9891797a277eb61f56fcde71cc78a6196d3886be

Since --3way insists --index, git diff needs to compare with HEAD.





Since --3way insists --index, git diff needs to compare with HEAD.







The guard is to alert patchlevel of X.Y.0
2021-04-06T03:02:46+00:00

NARUSE, Yui
naruse@airemix.jp

2021-04-06T02:25:10+00:00

ff91b97c83c5e9aa67bc4032d70f0ed19b334f44