Hi, On Sat, 22 Mar 2008, Jörg Sommer wrote: > The current version of git-rebase--interactive shows the user the > commits coming from a merge. > > M---A---B > \ \ > o---o---+---o branch > > Rebasing branch on M with preserve merges gives the commits A and B. But > if you mark them for editing or remove them the rebase fails. You must > keep them as they are. It's useless to bother the user with these > commits and might lead to mistakes. It is not useless. It's just that you seemed to have found buggy behaviour. I am _totally_ opposed to your patch without even reading more than the commit message. Ciao, Dscho