From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 May 2008 23:44:01 GMT
Subject: Re: [PATCH] Documentation: mention how to define multiple strategies
Message-ID: <7vfxsjf7zy.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1210889417-21370-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> pull.twohead and pull.octopus supports multiple default strategies but
> this was undocumented and it was not obvious how to do so.

It indeed is supported to give multiple strategies and let "git merge" try
each of them.

However, I have a very strong doubt if it is really worth keeping the
support, let alone advertising it.

Really.  It was a fun experiment while it was being invented, but I never
saw any practical usefulness with it.