From: "Lars Hjemli" <hjemli@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Junio C Hamano" <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH 0/2] add support for per branch merge policy
Date: Thu, 20 Sep 2007 15:38:48 +0200 [thread overview]
Message-ID: <8c5c35580709200638v75fcf611m7c6465d074c9244d@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0709201424270.28395@racer.site>
[...joining two posts in one...]
On 9/20/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > On 9/20/07, Lars Hjemli <hjemli@gmail.com> wrote:
> > > branch.<name>.integrationonly
> >
> > Btw: we might want to call this 'branch.<name>.mergepolicy' with the
> > possible values 'synchronize' and 'integrate'.
>
> IMHO this is way too limiting.
> Why not have something like branch.<name>.mergeOptions instead?
Yeah, that would be more powerful, I'll give it a try.
--
larsh
prev parent reply other threads:[~2007-09-20 13:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-20 12:53 [PATCH 0/2] add support for per branch merge policy Lars Hjemli
2007-09-20 12:53 ` [PATCH 1/2] git-merge: add option --no-ff Lars Hjemli
2007-09-20 12:53 ` [PATCH 2/2] add support for branch.<name>.integrationonly Lars Hjemli
2007-09-20 13:14 ` Johannes Schindelin
2007-09-20 13:36 ` Matthieu Moy
2007-09-20 13:07 ` [PATCH 0/2] add support for per branch merge policy Lars Hjemli
2007-09-20 13:24 ` Johannes Schindelin
2007-09-20 13:38 ` Lars Hjemli [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=8c5c35580709200638v75fcf611m7c6465d074c9244d@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).