Constantine Plotnikov wrote:
The man page for git rebase mentions "--preserve-merges" command line option but this option does not seems to be available. Also if this option is specified, the following usage statement is printed: Usage: git rebase [--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>] And this usage statement does not mention -m and -s options that seems to be available. I assume that the problem is the obsolete documentation.
You're probably using an old git where merge-preserving rebase is only available for interactive mode. Check the man-page again, and thoroughly this time ;-) -- Andreas Ericsson andreas.ericsson@xxxxxx OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 -- 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
