From: Junio C Hamano <junkio@cox.net>
To: Mark Hollomon <markhollomon@comcast.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Let merge set the default strategy.
Date: Wed, 15 Mar 2006 15:40:41 -0800 [thread overview]
Message-ID: <7vhd5zff9i.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <1142463103-6986-markhollomon@comcast.net> (Mark Hollomon's message of "Wed, 15 Mar 2006 22:51:41 +0000 (UTC)")
Mark Hollomon <markhollomon@comcast.net> writes:
> If the user does not set a merge strategy for git-pull,
> let git-merge calculate a default strategy.
Makes lot of sense, thanks.
> This may be preferable to the earlier patch involving
> NO_PYTHON.
Which earlier patch???
prev parent reply other threads:[~2006-03-15 23:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-15 22:51 [PATCH] Let merge set the default strategy Mark Hollomon
2006-03-15 23:40 ` Junio C Hamano [this message]
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=7vhd5zff9i.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=markhollomon@comcast.net \
/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