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

Re: [PATCH RFC] rebase--interactive: if preserving merges, use first-parent to limit what is shown.

From
AKAvi Kivity <avi@redhat.com>
Date
Oct 7, 2008, 09:57 UTC
Message-ID
<48EB32A4.80809@redhat.com>
In-Reply-To
<20081006212021.04ba9214.stephen@exigencecorp.com>
Stephen Haberman wrote:
Show 5 quoted lines
> However, t3404 makes a good point that if the right hand of the merge
> has parents that are going to get rebased, the right hand side does
> need to be included/shown/rewritten.
>
>

But, won't those commits get linearized? Won't git rebase pick the commits into the left-hand side of the merge instead of into the right hand side?

If git rebase is to handle nonlinear history, it needs much more expressive commands; not only saying which commit to pick, but also what the commit's parents shall be.

-- 
error compiling committee.c: too many arguments to function
Previous: Shawn O. PearceNext: Stephan Beyer
Message 6 of 8 in “git rebase -i -p broken?”
  1. Avi KivityOct 5, 2008
  2. rebase--interactive: if preserving merges, use first-parent to limit what is shown.Stephen Haberman, Oct 6, 2008
  3. Stephen HabermanOct 7, 2008
  4. Stephen HabermanOct 7, 2008
  5. Shawn O. PearceOct 7, 2008
  6. Avi KivityOct 7, 2008
  7. Stephan BeyerOct 7, 2008
  8. Avi KivityOct 7, 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.