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

Re: Rebasing multiple branches

From
Thomas Rast <trast@student.ethz.ch>
Date
Dec 31, 2010, 14:55 UTC
Message-ID
<201012311555.26354.trast@student.ethz.ch>
In-Reply-To
<20101230053530.GA10511@nibiru.local>

Please don't cull the Cc lists. Unless he's subscribed, Leonid never got your reply!

Enrico Weigelt wrote:
Show 6 quoted lines
> * Leonid Podolny <leonidp.lists@gmail.com> wrote:
> 
> > Ah, nice. I didn't notice the -p option. However, the man page advises 
> > against using -p and -i together.
> 
> Last time I checked, -i required -p ...
-p internally implies -i, but the user doesn't have to know that ;-)

The problem is that the todo file language is not expressive enough for what -p needs to do. Running a rebase -p without changing the todo file should behave reasonably. On the other hand, if you rearrange or extend the todo file in many cases that gives unexpected results.

Hence the recommendation to not use it with -i.
-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Previous: Enrico Weigelt
Message 6 of 6 in “Rebasing multiple branches”
  1. Leonid PodolnyDec 21, 2010
  2. Johannes SixtDec 21, 2010
  3. Enrico WeigeltDec 22, 2010
  4. Leonid PodolnyDec 22, 2010
  5. Enrico WeigeltDec 30, 2010
  6. Thomas RastDec 31, 2010

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.