I've recently run into broken behavior with `git-rebase` and `--keep-empty`. As soon as `--keep-empty` is specified, we fall back on using `git cherry-pick` instead of `git am` for rebasing the commits, which seems to not work correctly. In fact I guess there are two different bugs in here. The first bug is in using `git cherry-pick --allow-empty` instead of `git cherry-pick --keep-redundant-commits`, as judging from git-rebase(1) we also want to keep commits that are already included in the branch that is being rebased upon whe we use `--keep-empty`. The second bug is that we fail to correctly record the rebasing-state when using cherry-pick. This causes us to end up in cherry-picking mode as soon as the invoked cherry-pick command runs into any error (e.g. due to a conflict or the broken behavior with `--allow-empty`). There is also no possibility to get back into rebase-mode from here. I've written two tests that document these breakages, as well as a fix to the first described breakage. I did not fix the second breakage of not recording rebase-state, though, as this is somewhat more involved. Patrick Patrick Steinhardt (2): rebase: test broken behavior with --keep-empty rebase: fix preserving commits with --keep-empty git-rebase--am.sh | 2 +- t/t3400-rebase.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html