From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 19:51:09 GMT
Subject: Re: [BUG] git-merge-octopus creates an empty merge commit with one parent
Message-ID: <7vpqdieclu.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120213202039.5346fa89@gmail.com>

Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:

> ... Except that I still think this behavior is not correct.

Well, what was missing from my "don't do it then" quote was "Doctor it
HURTS when I do this."; there is no question that it is not correct if it
hurts ;-).

Patches welcome; I suspect it shouldn't be too intrusive or difficult.