Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > I briefly considered consolidating them and using .git/rebase-merge/ as > state directory also for cherry-pick/revert, but that would cause > problems: I am surely not the only user who cherry-picks commits manually > while running interactive rebases. Good thinking.