From: "Sverre Rabbelier" <alturin@gmail.com>
To: "Miklos Vajna" <vmiklos@frugalware.org>
Cc: git@vger.kernel.org, "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [RFC] custom strategies in builtin-merge
Date: Fri, 25 Jul 2008 13:50:40 +0200 [thread overview]
Message-ID: <bd6139dc0807250450m25a932b8h68fcee13f8c343dc@mail.gmail.com> (raw)
In-Reply-To: <20080725113316.GF32057@genesis.frugalware.org>
On Fri, Jul 25, 2008 at 13:33, Miklos Vajna <vmiklos@frugalware.org> wrote:
> 1) Maintain a list of commands that has a git-merge- prefix, but not a
> strategy. This list would currently contain "base, file, index,
> one-file and tree".
Sounds a bit error prone, and could lead to unexpected results if/when
someone creates a new command ('git merge status' anyone?) which is
then suddenly treated as a merge strategy.
> 2) Require custom strategies to have a different naming scheme, like
> if "foo" is a custom strategy, then it would have to be named
> git-merge-custom-foo, _not_ git-merge-foo.
I think this is cleaner, what would be even nicer is to change the
current names too, so name them all "git-merge-stragegy-foo".
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2008-07-25 11:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-25 11:33 [RFC] custom strategies in builtin-merge Miklos Vajna
2008-07-25 11:50 ` Sverre Rabbelier [this message]
2008-07-26 0:33 ` Junio C Hamano
2008-07-26 0:51 ` Johannes Schindelin
2008-07-26 1:12 ` Junio C Hamano
2008-07-26 2:37 ` Johannes Schindelin
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=bd6139dc0807250450m25a932b8h68fcee13f8c343dc@mail.gmail.com \
--to=alturin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sverre@rabbelier.nl \
--cc=vmiklos@frugalware.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;
as well as URLs for NNTP newsgroup(s).