From: Junio C Hamano <gitster@pobox.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: git@vger.kernel.org, jean-luc malet <jeanluc.malet@gmail.com>
Subject: Re: [PATCH 3/3] builtin-merge: add support for default merge options
Date: Fri, 06 Mar 2009 23:18:37 -0800 [thread overview]
Message-ID: <7vzlfxpzqq.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <76718490903061756g4ca88c21h8bf786048d4ad05@mail.gmail.com> (Jay Soffian's message of "Fri, 6 Mar 2009 20:56:21 -0500")
Jay Soffian <jaysoffian@gmail.com> writes:
> On Fri, Mar 6, 2009 at 7:58 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> I think it would be much better if you did not introduce a new
>> configuration merge.options which is not consistent with everything else
>> to begin with.
>>
>> Instead, if your addition was literally to allow saying things like this,
>> it would be much easier to understand.
>>
>> [branch "*"]
>> mergeoptions = ...
>> remote = origin
>> rebase = true
>
> Okay. That's probably a more invasive patch, because a lot more code
> paths look at [branch ...], but I'll look into it.
Note that you do not have to cover branch.*.remote and other things in the
same patch. The first one could just handle branch.*.mergeoptions and you
can let later patches to implement the fallbacks for other variables.
next prev parent reply other threads:[~2009-03-07 7:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 22:15 [PATCH 0/3] Re: how to have --no-ff be the default for all branch Jay Soffian
2009-03-06 22:15 ` [PATCH 1/3] config: add git_config_option_string() Jay Soffian
2009-03-06 22:15 ` [PATCH 2/3] builtin-merge: refactor to use git_config_option_string Jay Soffian
2009-03-06 22:15 ` [PATCH 3/3] builtin-merge: add support for default merge options Jay Soffian
2009-03-06 22:46 ` Junio C Hamano
2009-03-06 23:16 ` Jay Soffian
2009-03-07 0:44 ` [PATCH v2 " Jay Soffian
2009-03-07 0:58 ` [PATCH " Junio C Hamano
2009-03-07 1:56 ` Jay Soffian
2009-03-07 7:18 ` Junio C Hamano [this message]
2009-03-07 13:48 ` Jay Soffian
2009-03-07 19:31 ` jean-luc malet
2010-03-19 14:19 ` jean-luc malet
2010-03-19 14:54 ` Jay Soffian
2010-04-02 17:19 ` jean-luc malet
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=7vzlfxpzqq.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=jeanluc.malet@gmail.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).