From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Aug 2008 18:22:43 GMT
Subject: Re: [PATCH] bash-completion: fix getting strategy list
Message-ID: <7v3akzsg0c.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <fcaeb9bf0808200958u65ad8fa3oa118b88e16c9c50c@mail.gmail.com>

"Nguyen Thai Ngoc Duy" <pclouds@gmail.com> writes:

> On second thought, I don't think the patch's worth it. The code in
> git-completion.bash is a hack and I replace it with another the hack.
> It won't work for custom merges and git-completion.bash will need to
> be synced manually anyway, so maybe this patch will do better:

This would be the right thing to do for the 'maint' track.  In the longer
term, especially if we are to actually make the "custom" thing official, I
think teaching "git-merge" to report what are available is the only
sensible approach, though.