Hi Matthijs, 2010/10/12 Matthijs Kooijman <matthijs@xxxxxxxx>: > Have you tried the --preserve-merges option to rebase? No, I didn't know about this option. Thank you for the tip. I just tried, and it does not work either. The merge commit is preserved, but the commit I'm push back in time is lost. There is a warning against this kind behaviour when using both --interactive and rebase. Thanks, -- Sebastian -- 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