{"thread":{"id":"16561","subject":"[man bug?] git rebase --preserve-merges","startedAt":"2008-12-02T16:45:17Z","lastAt":"2008-12-03T07:43:24Z","messageCount":2,"participants":["Constantine Plotnikov","Andreas Ericsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"96965","messageId":"85647ef50812020845g7de701bbye4a43a4e992a264b@mail.gmail.com","threadId":"16561","inReplyTo":null,"subject":"[man bug?] git rebase --preserve-merges","fromName":"Constantine Plotnikov","fromEmail":"constantine.plotnikov@gmail.com","sentAt":"2008-12-02T16:45:17Z","receivedAt":"2008-12-02T16:45:17Z","isPatch":false,"sender":{"key":"constantine.plotnikov@gmail.com","avatar":null},"body":"The man page for git rebase mentions \"--preserve-merges\" command line\noption but this option does not seems to be available.\n\nAlso if this option is specified, the following usage statement is printed:\n\nUsage: git rebase [--interactive | -i] [-v] [--onto <newbase>]\n<upstream> [<branch>]\n\nAnd this usage statement does not mention -m and -s options that seems\nto be available. I assume that the problem is the obsolete\ndocumentation.\n\nRegards,\nConstantine\n"},{"id":"97028","messageId":"4936389C.9090904@op5.se","threadId":"16561","inReplyTo":"85647ef50812020845g7de701bbye4a43a4e992a264b@mail.gmail.com","subject":"Re: [man bug?] git rebase --preserve-merges","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-12-03T07:43:24Z","receivedAt":"2008-12-03T07:43:24Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Constantine Plotnikov wrote:\n> The man page for git rebase mentions \"--preserve-merges\" command line\n> option but this option does not seems to be available.\n> \n> Also if this option is specified, the following usage statement is printed:\n> \n> Usage: git rebase [--interactive | -i] [-v] [--onto <newbase>]\n> <upstream> [<branch>]\n> \n> And this usage statement does not mention -m and -s options that seems\n> to be available. I assume that the problem is the obsolete\n> documentation.\n> \n\nYou're probably using an old git where merge-preserving rebase is only\navailable for interactive mode. Check the man-page again, and thoroughly\nthis time ;-)\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"}]}