3 ms·
> Do you ever want to go back and edit a previous unpublished commit? Yes fixups exist, but that’s a band aid over the fact that editing a previous one is annoy
by Izkata 2y ago
> Do you ever want to go back and edit a previous unpublished commit? Yes fixups exist, but that’s a band aid over the fact that editing a previous one is annoying and hard.
Also unnecessary, "git rebase -i" has an "edit" command that pauses the rebase at that commit to let you do whatever.
- Valodim 2y agoThis is roughly the reaction I meant going into this discussion :) The rebase next level part is not about using git rebase in the right way, it's about every command including status sometimes doing 15 rebases without even mentioning it.
- steveklabnik 2y agoWhat jj does is not require you to pause. It’s fine with leaving stuff in a conflicted state, letting you do whatever you want as a next step. That may be resolving the rebase, but maybe you didn’t realize you were gonna have a conflict and want to get something else done real quickly. In-memory, always succeeding rebases are just really nice.
- stouset 2y agoAnd also you can just… edit a commit. It’s not some special side effect of a certain flag to a different command. You can just say “gosh I really wish I’d made some changes here” and either move changes in, or just jump in and live-edit it directly. It’s really a completely different way of thinking, but shockingly, one that essentially directly maps to what your actual intentions are.