From: Junio C Hamano <gitster@pobox.com>
To: Gerrit Pape <pape@smarden.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges
Date: Mon, 25 Jun 2007 00:50:27 -0700 [thread overview]
Message-ID: <7vk5ts1ni4.fsf@assigned-by-dhcp.pobox.com> (raw)
In-Reply-To: <20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org> (Gerrit Pape's message of "Mon, 25 Jun 2007 07:16:23 +0000")
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.
next prev parent reply other threads:[~2007-06-25 7:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-25 7:16 [PATCH] git-merge: record merge strategy in the log message on auto resolved merges Gerrit Pape
2007-06-25 7:50 ` Junio C Hamano [this message]
2007-06-25 7:53 ` Johannes Schindelin
-- strict thread matches above, loose matches on Subject: below --
2007-06-06 8:24 Gerrit Pape
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vk5ts1ni4.fsf@assigned-by-dhcp.pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pape@smarden.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox