From: Daniel Barkalow <barkalow@iabervon.org>
Date: Wed, 02 Nov 2005 21:45:22 GMT
Subject: Re: [PATCH] Add 'ours' merge strategy.
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:

> 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*