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

Re: Idea for rebase strategy

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 27, 2006, 23:40 UTC
Message-ID
<Pine.LNX.4.63.0611280037200.30004@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7vfyc5l24t.fsf@assigned-by-dhcp.cox.net>
Hi,
On Mon, 27 Nov 2006, Junio C Hamano wrote:
Show 10 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > an idea hit me today: maybe we can make rebase work nicely with merges 
> > after all. We could record the original branch point and the new branch 
> > point for rebases.
> 
> [...]
> 
> If we have a reliable ref-log for 'topic' that should be trivial
> to do.

But of course! Yet another reason to introduce core.disableRefLog, and turn it on by default...

The graceful merging of a rebased branch indeed depends on the local history, i.e. what is stored in the reflog.

Ciao, Dscho

Previous: Junio C Hamano
Message 5 of 5 in “Idea for rebase strategy”
  1. Johannes SchindelinNov 27, 2006
  2. Junio C HamanoNov 27, 2006
  3. Andy WhitcroftNov 27, 2006
  4. Junio C HamanoNov 27, 2006
  5. Johannes SchindelinNov 27, 2006

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.