clacke: exhausted pixie dream boy 🇸🇪🇭🇰💙💛<p><span class="h-card"><a href="https://merveilles.town/users/raboof" class="u-url mention" rel="nofollow noopener" target="_blank">@<span>raboof</span></a></span> Oh, nice!</p><blockquote>&gt; the break command (added in Git 2.20)</blockquote><p><br>Sweet! I've been using the trick originally described, putting a dummy edit after the merge and then resetting back to the merge, for years!</p><p>I absolutely love --rebase-merges and use it many times per day to build and keep track of multiple parallel PRs.</p><p><a href="https://libranet.de/search?tag=git" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>git</span></a> <a href="https://libranet.de/search?tag=GitRebase" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>GitRebase</span></a> <a href="https://libranet.de/search?tag=GitRebaseInteractive" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>GitRebaseInteractive</span></a></p>