From: Holger Hellmuth <hellmuth@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>, Jeff King <peff@peff.net>,
Neal Kreitzinger <nkreitzinger@gmail.com>,
git@vger.kernel.org
Subject: Re: who's on first? - following first parent and merge-management
Date: Fri, 09 Mar 2012 13:05:38 +0100 [thread overview]
Message-ID: <4F59F212.6030701@ira.uka.de> (raw)
In-Reply-To: <7vpqcndmpa.fsf@alter.siamese.dyndns.org>
On 08.03.2012 18:30, Junio C Hamano wrote:
> Johannes Sixt<j.sixt@viscovery.net> writes:
>> To avoid the situation,...
>> This would not be necessary if the order of the merge parents could be
>> specified, e.g.:
>>
>> # on topic
>> git merge --into master
>
> I think the underlying mechanism needed to implement the above
> shares a lot with what Jeff called "crazy idea", but where you would
> want to be after such a merge may be different in these two cases.
I don't think there is much question that you should still be in the
same branch. Not because you necessarily want to be in that branch. But
because it would be surprising if git-merge changed your branch
sometimes and most times not.
next prev parent reply other threads:[~2012-03-09 12:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 5:36 who's on first? - following first parent and merge-management Neal Kreitzinger
2012-03-07 7:37 ` Junio C Hamano
2012-03-08 6:13 ` Junio C Hamano
2012-03-08 7:14 ` Jeff King
2012-03-08 7:38 ` Junio C Hamano
2012-03-08 8:03 ` Johannes Sixt
2012-03-08 17:30 ` Junio C Hamano
2012-03-09 12:05 ` Holger Hellmuth [this message]
2012-03-09 12:29 ` Johannes Sixt
2012-03-09 13:25 ` Holger Hellmuth
2012-03-09 16:26 ` Junio C Hamano
2012-03-08 7:49 ` Jonathan Nieder
2012-03-08 22:52 ` Junio C Hamano
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=4F59F212.6030701@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=nkreitzinger@gmail.com \
--cc=peff@peff.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).