diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2025-10-28 21:55:09 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2025-11-05 15:01:16 +0900 |
| commit | f979ef1fb34569cfa34f00691591feac58b27842 (patch) | |
| tree | d7547ff73a8e3598192ef46b5288f19bafa27a0f /.github | |
| parent | 85e0f8c8783f5366c9c848efbf37f72beb17f574 (diff) | |
sync_default_gems.rb: gracefully handle merge commits
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.
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions