3 ms·
I prefer to do my interactive rebases in steps, instead of all at once. If I want to rebase changes onto a different commit, re-order them and squash some of i
by bentcorner 5y ago
I prefer to do my interactive rebases in steps, instead of all at once.
If I want to rebase changes onto a different commit, re-order them and squash some of it, I'll rebase as-is first, then do another rebase and reorder everything so that squashes are next to each other (and yes, sometimes this means unnecessary conflict resolutions), then a final rebase to squash. I'll edit messages last.