git-revise

I like the look of this. I’ve definitely used git-format-patch and git-am directly so I can edit the diffs directly. Diffing diffs can be fun too. A couple of times in complex rebasings I’ve even needed to go to the point of diffing diff diffs, which is perhaps taking it a bit too far. Another handy extension in this general space is git-revise <https://github.com/mystor/git-revise>, which is roughly git-rebase but without touching the working tree. I use it regularly in crafting artisanal history.

git-revise is what you want here. It’s rebase, but without touching the working tree. This makes it vastly faster, avoids changing file mtimes (which is very useful property if you have a build system that operates on mtimes, such as make, or something that is watching for file system changes), and if you do need to resolve conflicts it’s easier to confirm that you haven’t changed anything in the final result, because that’ll produce warnings and a dirty index. https://github.com/mystor/git-revise Since learning about this, 90% of my rebase usage has switched to revise, and I’m much happier with it all. I also probably revise commits twice as often as I used to because it’s so much faster and has no file system modification side-effects. When there are conflicts, it only gets you a two-way merge, so that occasionally I reach for rebase to