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

Re: [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 2, 2008, 15:29 UTC
Message-ID
<alpine.DEB.1.00.0806021628260.13507@racer.site.net>
In-Reply-To
<4843FD44.90905@viscovery.net>
Hi,
On Mon, 2 Jun 2008, Johannes Sixt wrote:
Show 13 quoted lines
> From: Johannes Sixt <johannes.sixt@telecom.at>
> 
> If the upstream argument to rebase (the first argument) was relative to
> HEAD and the name of the branch to rebase (the second argument) was given,
> the upstream would have been interpreted relative to the second argument.
> In particular, this command
> 
>     git rebase -i HEAD topic
> 
> would always finish with "Nothing to do". (a1bf91e fixed the same issue
> for non-interactive rebase.)
> 
> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Show 5 quoted lines
> I made this with -U5 so that you can see the checkout in the context.
> 
> BTW, methinks, this checkout is unnecessary, since before the rebase 
> begins, there is a 'git checkout $ONTO', and the branch switching is 
> certainly not needed to compute the todo list...
It is needed to determine which branch to update after finish.

Ciao, Dscho

Previous: Johannes SixtNext: Junio C Hamano
Message 2 of 4 in “rebase --interactive: Compute upstream SHA1 before switching branches”
  1. rebase --interactive: Compute upstream SHA1 before switching branchesJohannes Sixt, Jun 2, 2008
  2. Johannes SchindelinJun 2, 2008
  3. Junio C HamanoJun 3, 2008
  4. Johannes SchindelinJun 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.