Interactive rebase including cherry-picked commits

[ocdi]

I'm trying to use the technique in #889 to visually perform a git cherry - it actually allows us to ultimately cherry-pick additional commits in the same operation, which is really handy.

Unfortunately this doesn't quite work as expected. Using the UI I get a massive list of commits.

Whereas using git rebase -i the todo editor gives just these commits, and warnings per below. I would expect the UI to also skip the previously applied commits.

pick a865718d0 Merged PR 12013
pick a6bff52d4 Merged PR 12014
pick 9032a27d2 Merged PR 12017
pick 197d2ac6b Merged PR 11999
pick e7e528a31 Merged PR 12004
pick bba041f50 Merged PR 12023
pick 72483c511 Merged PR 12030

The console shows

warning: skipped previously applied commit 0e72f026c
warning: skipped previously applied commit 6dbc009b8
warning: skipped previously applied commit cbbee2909
warning: skipped previously applied commit be399ff87
warning: skipped previously applied commit 8658474fd
warning: skipped previously applied commit 13d0f873a
warning: skipped previously applied commit 02f8fd0e0
warning: skipped previously applied commit 21847ec37

Am I doing something wrong or is the interactive rebase not correctly skipping?

[love-linger]

Done. Missing --cherry-pick flag while querying commits for interactive-rebasing. You can download the latest CI build from GitHub Action.

[ocdi]

Amazing I tested the CI build and this shows the correct (smaller) number of commits.