From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j6t@kdbg.org>, Eric Raible <raible@gmail.com>,
git@vger.kernel.org
Subject: Re: git merge remote branch says "Merge commit ..."?
Date: Sat, 23 May 2009 02:26:58 -0700 [thread overview]
Message-ID: <7vljoo2mql.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20090523091711.GB20416@coredump.intra.peff.net> (Jeff King's message of "Sat\, 23 May 2009 05\:17\:12 -0400")
Jeff King <peff@peff.net> writes:
> Right. We could probably use similar logic in "git merge". I'm not sure
> if it is worth the trouble to end up with "Merge branch 'master' of
> origin" instead of "Merge remote branch 'origin/master'".
I do not think it is worth doing that to lose information, either.
next prev parent reply other threads:[~2009-05-23 9:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-21 19:50 git merge remote branch says "Merge commit ..."? skillzero
2009-05-22 7:49 ` Jeff King
2009-05-22 17:29 ` Eric Raible
2009-05-22 17:54 ` Jeff King
2009-05-22 18:08 ` git merge remote branch says Eric Raible
2009-05-22 18:10 ` Jeff King
2009-05-22 18:30 ` git merge remote branch says "Merge commit ..."? Johannes Sixt
2009-05-23 9:17 ` Jeff King
2009-05-23 9:26 ` Junio C Hamano [this message]
2009-05-25 9:44 ` Jeff King
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=7vljoo2mql.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--cc=raible@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).