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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html