From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2007 07:50:27 GMT
Subject: Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges
Message-ID: <7vk5ts1ni4.fsf@assigned-by-dhcp.pobox.com>
In-Reply-To: <20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org>

Gerrit Pape <pape@smarden.org> writes:

> If a strategy module auto resolved the merge cleanly, record the used
> strategy in the log message, e.g.:
>
>   Merge branch 'maint' using strategy ours
>
> Signed-off-by: Gerrit Pape <pape@smarden.org>
> ---
>
>> I personally find this useful especially for the 'ours' strategy.

I really do not think we want to do this, especially when the
user did not specify anything unusual like "ours".

At least, exclude recursive and octopus out of it, please.