From: Junio C Hamano <junkio@cox.net>
To: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Cc: Luben Tuikov <ltuikov@yahoo.com>, git@vger.kernel.org
Subject: Re: warning merge message
Date: Fri, 22 Dec 2006 15:00:56 -0800 [thread overview]
Message-ID: <7vy7ozv8lz.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200612222349.54363.Josef.Weidendorfer@gmx.de> (Josef Weidendorfer's message of "Fri, 22 Dec 2006 23:49:54 +0100")
Josef Weidendorfer <Josef.Weidendorfer@gmx.de> writes:
> In a previous discussion, you talked about switching to
> the new behavior (ie. getting rid of this "first set of
> branches" rule) when there is at least one branch.*.merge
> setting in the config file.
>
> Unfortunately I can not see an easy way to check this with
> repo-config, as there is no wildcard support for keys
> (Ok, I can do a list of keys and grep).
I think --get-regexp is what you want -- see my "patch for
discussion".
> I think it is better to provide an option
> "pull.do-not-follow-the-first-set-of-branches-rule".
> And we should make this the default after init-db or clone.
Yes, but the problem is that old timers do make new clones.
pull.i-like-the-first-set-of-branches in ~/.gitconfig is the
only thing I can think of but that is too ugly and is already on
the slippery slope of user.expert configuration which I do not
think we want.
next prev parent reply other threads:[~2006-12-22 23:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-20 21:22 warning merge message Luben Tuikov
2006-12-21 9:23 ` Johannes Schindelin
2006-12-22 0:25 ` Luben Tuikov
2006-12-22 0:43 ` Shawn Pearce
2006-12-22 0:49 ` Junio C Hamano
2006-12-22 6:00 ` Junio C Hamano
2006-12-22 20:42 ` Josef Weidendorfer
2006-12-22 21:12 ` Junio C Hamano
2006-12-22 22:49 ` Josef Weidendorfer
2006-12-22 23:00 ` Junio C Hamano [this message]
2006-12-23 0:05 ` Josef Weidendorfer
-- strict thread matches above, loose matches on Subject: below --
2006-12-20 21:34 Luben Tuikov
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=7vy7ozv8lz.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Josef.Weidendorfer@gmx.de \
--cc=git@vger.kernel.org \
--cc=ltuikov@yahoo.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).