Hallo Björn, Björn Steinbrink schrieb am Sat 22. Mar, 02:52 (+0100): > On 2008.03.22 02:19:42 +0100, 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. > > Uhm, why do you completely remove the possibility to edit A Ahh, now I see what you've tried to say. I did add the option --first-parent for rebase interactive *without* preserve merges, too. I'll update my patch. Bye, Jörg. -- “Science is the game we play with God to find out what his rules are.”
Attachment:
signature.asc
Description: Digital signature http://en.wikipedia.org/wiki/OpenPGP
