On 23/08/17 15:40, Johannes Schindelin wrote: > > These days, I reflexively type `rebase -ki` instead of `rebase -i`. Maybe > you want to do that, too? > > Ciao, > Dscho > This is slightly off topic but when I was preparing the patches for [1] I noticed a couple of potential bugs with rebase --keep-empty that I haven't got around to doing anything about. 1 - If 'rebase --keep-empty' stops for a conflict resolution then it cannot resume. This is because it uses cherry-pick rather than format-patch/am and does not create $GIT_DIR/rebase-apply so there is no saved rebase state for continue to use. In any case the --continue code does not have the cherry-pick special case for --keep-empty that the startup code does. I think this could be fixed by using an implicit interactive rebase. 2 - The opt-spec allows '--no-keep-empty' but as far as I could see that option is never checked for in the rebase code. Best Wishes Phillip [1] https://public-inbox.org/git/20170726102720.15274-1-phillip.wood@xxxxxxxxxxxx/
