From: Thomas Rast <trast@student.ethz.ch>
Date: Sun, 15 Nov 2009 21:13:15 GMT
Subject: Re: [PATCH 0/3] Document and refuse rebase -s ours
Message-ID: <200911152213.18743.trast@student.ethz.ch>
In-Reply-To: <7veinzfqj9.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:
> 
> I'd rewrite [3/3] in the following way to keep it easier to maintain the
> blacklist, like this.
> 
>             case "$1" in
>     -       ours)
>     +       ours | theirs | octopus | subtree)

I agree with the rewrite; it's easier to maintain, even though it's
now in a quite strange place.

However, I think the example you gave is misleading: 'subtree' is a
useful strategy if you want to rebase across a subtree merge boundary,
isn't it?

-- 
Thomas Rast
trast@{inf,student}.ethz.ch