Post #2321793
2026-05-09 06:20 UTC
TIL git-rebase -r
By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With --rebase-merges, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits.
Replies (1)
-
@billchenchina@bcom.moe 2026-05-09 06:20
hint: 'reword' does not take a merge commit. If you wanted to hint: replay the merge and reword the commit message, use hint: 'merge -c' on the commit