mirror of
https://github.com/ruby/ruby.git
synced 2026-01-27 04:24:23 +00:00
f979ef1fb3
Find interesting commits by following parents instead of relying on "git log". If we encounter a merge commit that may contain a conflict resolution, fall back to cherry-picking the merge commit as a whole rather than replaying each individual commit. The sync commit will include a shortlog for the squashed commits in that case.