At 09:58 -0800 26 Nov 2012, Junio C Hamano <gitster@xxxxxxxxx> wrote:
Kacper Kornet <draenog@xxxxxxxxxxxxx> 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.
--
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