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

Re: [PATCH] Add 'ours' merge strategy.

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Nov 2, 2005, 21:45 UTC
Message-ID
<Pine.LNX.4.64.0511021616290.25300@iabervon.org>
In-Reply-To
<Pine.LNX.4.63.0511021134100.6501@wbgn013.biozentrum.uni-wuerzburg.de>
On Wed, 2 Nov 2005, Johannes Schindelin wrote:
Show 9 quoted lines
> Hi,
> 
> On Tue, 1 Nov 2005, Junio C Hamano wrote:
> 
> >  This can be used to terminate an old maintenance branch without
> >  leaving people's repositories behind.
> 
> How about optionally do something similar when git-rebase'ing? Especially 
> "pu"?

For that, you'd additionally want to have the parent whose content was ignored be listed as "optional" in a sense; users shouldn't have to download all the commits that "pu" went through that have been superceded, unless they're actually trying to get back from a superceded commit; the log on that line isn't interesting (because all the useful messages are in the rebased line, too, in potentially better versions), and so forth.

	-Daniel
*This .sig left intentionally blank*
Previous: Johannes Schindelin
Message 3 of 3 in “Add 'ours' merge strategy.”
  1. Add 'ours' merge strategy.Junio C Hamano, Nov 2, 2005
  2. Johannes SchindelinNov 2, 2005
  3. Daniel BarkalowNov 2, 2005

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.