| > Why would I use Stacked Git rather than Git’s fixup/interactive rebase dance? Yeah, dance is good analogy. Lot of training, one little mistake and it is ruined. For example, if you need to introduce a change in commit "one thing" which would require merge conflict resolving in "other thing", with stgit it would be much easier than with fixup/autosquash. Or another example. You need to put away "other thing" for a while, and work with "one thing" for an hour, and then apply/fix "other thing". Another set of git tricks needed. > But I’m not sure I’d take on a new tool dependency just for that. If you are happy with git, nobody forces you to. By the way, you don't have to use stgit all the time. I usually just use git, but when a change in a branch requires changing of previous commit, I simply do: stg init; stg uncommit; stg pop. It's easy to convert local repo state to and from stgit. |