On 2009-01-15, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Second, what result do you expect? If the merge is to be preserved then I don't know. I did this while trying to understand where and how "-p" makes a difference. If there's anything you can point me to that explains rebase -p, especially from a "here's where it comes useful" point of view, I'd appreciate it. -- 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