4 ms·
The author might enjoy `git rebase -i main`, which allows reordering, renaming, combining or pretty much everything in your own branch before you rebase and mer
by mitko 5y ago
The author might enjoy `git rebase -i main`, which allows reordering, renaming, combining or pretty much everything in your own branch before you rebase and merge it to the main branch.
That way even if a commit message is not clear or you added an improvement to an earlier commit, you can reduce the clutter a lot before sending out for code review, while still having individual commits for different parts of the code change
- martijnvds 5y agoDoing that will kind of work, but you'll lose the context of the group after merging/fast-forwarding onto the main branch.
- frutiger 5y agoIf you always create a merge commit, you can see the group as you traverse the history via the two parent commits. One will walk the group and the other will go directly to the state before the group.