From: Aaron Schrab <aaron@schrab.com>
Date: Mon, 26 Nov 2012 23:24:11 GMT
Subject: Re: [RFC/PATCH] Option to revert order of parents in merge commit
Message-ID: <20121126232411.GB3937@pug.qqx.org>
In-Reply-To: <7v8v9otfdy.fsf@alter.siamese.dyndns.org>

At 09:58 -0800 26 Nov 2012, Junio C Hamano <gitster@pobox.com> wrote:
>Kacper Kornet <draenog@pld-linux.org> writes:
>> The change of order of parents happens at the very last moment, so
>> "ours" in merge options is local version and "theirs" upstream.
>
>That may be something that wants to go to the proposed commit log
>message.  I am neutral on the "feature" (i.e. not against it but not
>extremely enthusiastic about it either).

That should also be included in the (currently nonexistent) 
documentation of the proposed option.