merging 3.5.3+glitch onto 3.5.2+glitch sure is a time if

• you have already cherry-picked a couple things from 3.5.3;
• you want a linear commit history;
• you want to preserve every individual commit; and
• for whatever goddamn reason rebasing onto trunk after git merge is reapplying something like 50 commits before trunk??? with all the merge conflicts that implies????? WHY