zlacker

[parent] [thread] 1 comments
1. WorldM+(OP)[view] [source] 2025-12-05 17:06:30
Add `--update-refs` to your interactive rebase and it will give you an easy line to know how many commits to drop because it will add an `update-ref` line for the old branch. You can just easily delete everything up to and including that `update-ref` line and don't have to manually pull up a git log of the other branch to remember which commits already merged.

(Plus, of course, if you have multiple branches stacked, `--update-refs` makes it easier to update all of them if you start from the outermost branch.)

replies(1): >>Xophme+1E2
2. Xophme+1E2[view] [source] 2025-12-06 15:52:13
>>WorldM+(OP)
Nice; thanks :) I usually squash-merge. Does that break this workflow?
[go to top]