Junio C Hamano <gitster@xxxxxxxxx> writes:
> "Sverre Rabbelier" <alturin@xxxxxxxxx> writes:
>
>> On Mon, Jul 28, 2008 at 22:20, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>>> "Sverre Rabbelier" <alturin@xxxxxxxxx> writes:
>>>> Mhhh, but the proposed strategy there was in response to the 'insane'
>>>> git-merge-theirs version, not to the 'exact opposite of
>>>> git-merge-ours' that I refer to now, yes?
>>>
>>> No.
>>
>> Nanako Shiraishi's patch was not in response to the "git-merge-theirs"
>> thread, or I am missing something here....?
>
> The quoted sentence by me in that message was after I explained why "per
> hunk theirs" aka "-Xtheirs" was not such a great idea I further went on to
> say "by the way, '-s theirs' is even worse and here is why".
Heh, I ended up doing the "digging" myself. The quote came from this:
http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89024
and "tried not to sound too negative" there refers to:
http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021
which _was_ about the "-Xtheirs", not "-s theirs".
--
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
