git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [man bug?] git rebase --preserve-merges

From
Andreas Ericsson <ae@op5.se>
Date
Dec 3, 2008, 07:43 UTC
Message-ID
<4936389C.9090904@op5.se>
In-Reply-To
<85647ef50812020845g7de701bbye4a43a4e992a264b@mail.gmail.com>
Constantine Plotnikov wrote:
Show 12 quoted lines
> 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@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
Previous: Constantine Plotnikov
Message 2 of 2 in “[man bug?] git rebase --preserve-merges”
  1. Constantine PlotnikovDec 2, 2008
  2. Andreas EricssonDec 3, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.