From: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [RFD] making separate-remote layout easier to use
Date: Mon, 27 Nov 2006 01:41:14 +0100 [thread overview]
Message-ID: <200611270141.14307.Josef.Weidendorfer@gmx.de> (raw)
In-Reply-To: <7v1wnr19do.fsf@assigned-by-dhcp.cox.net>
On Saturday 25 November 2006 22:53, Junio C Hamano wrote:
> - merging the "primary" branch is good only when the user is on
> the corresponding "primary" branch. It is usually a wrong
> thing to do when on another branch.
I vote for a config option
core.pull.stopWithoutDefaultMerge
which would error out on a
git pull
when no branch.<current branch>.merge is set with a message like
"No default remote branch set to merge into current branch <branch>.
Set branch.<branch>.remote/merge to make this work"
It is arguable if this option should change the behavior of
"git pull <repo>". Probably not: I would assume that the
user explicitly wants to merge the primary branch of <repo>.
Additionally, set branch.<primary>.remote/merge on git-clone,
together with core.pull.stopWithoutDefaultMerge=1.
next prev parent reply other threads:[~2006-11-27 0:41 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-25 21:53 [RFD] making separate-remote layout easier to use Junio C Hamano
2006-11-25 22:25 ` Jakub Narebski
2006-11-25 23:19 ` Junio C Hamano
2006-11-25 23:34 ` Jakub Narebski
2006-11-26 3:37 ` Junio C Hamano
2006-11-26 5:30 ` Junio C Hamano
2006-11-26 3:14 ` Shawn Pearce
2006-11-26 3:48 ` Junio C Hamano
2006-11-26 3:34 ` Shawn Pearce
2006-11-26 3:58 ` Junio C Hamano
2006-11-26 4:23 ` Shawn Pearce
2006-11-26 5:11 ` Junio C Hamano
2006-11-26 7:39 ` Shawn Pearce
2006-11-26 9:13 ` Junio C Hamano
2006-11-26 9:43 ` Jakub Narebski
2006-11-27 0:59 ` Josef Weidendorfer
2006-11-27 1:21 ` Junio C Hamano
2006-11-30 18:16 ` Jon Loeliger
2006-11-30 21:22 ` Junio C Hamano
2006-11-26 9:32 ` Jakub Narebski
2006-11-27 0:41 ` Josef Weidendorfer [this message]
2006-11-29 21:32 ` Jon Loeliger
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=200611270141.14307.Josef.Weidendorfer@gmx.de \
--to=josef.weidendorfer@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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;
as well as URLs for NNTP newsgroup(s).