From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Jay Soffian <jaysoffian@gmail.com>,
Junio C Hamano <gitster@pobox.com>, git <git@vger.kernel.org>
Subject: Re: Merge commit subjects git.git
Date: Sun, 18 Jul 2010 16:18:05 +0000 [thread overview]
Message-ID: <AANLkTikhhjjRYPY4KWEJWUQjCw4TzhXRMvHRsaQ7BECe@mail.gmail.com> (raw)
In-Reply-To: <201007181733.59704.trast@student.ethz.ch>
On Sun, Jul 18, 2010 at 15:33, Thomas Rast <trast@student.ethz.ch> wrote:
> A merge that does not have the 'into <branch>' bit is a merge to
> master:
>
> static void do_fmt_merge_msg_title(struct strbuf *out,
> const char *current_branch) {
> [...]
> if (!strcmp("master", current_branch))
Is there anything in Git that records what the canonical branch is?
E.g. perl uses "blead", and gets these "into blead" merge commits
every time it merges into the main branch.
The HEAD can move, so that can't be checked.
(not that this is an actual problem)
> strbuf_addch(out, '\n');
> else
> strbuf_addf(out, " into %s\n", current_branch);
> }
next prev parent reply other threads:[~2010-07-18 16:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-18 8:22 Merge commit subjects git.git Jay Soffian
2010-07-18 15:33 ` Thomas Rast
2010-07-18 16:18 ` Ævar Arnfjörð Bjarmason [this message]
2010-07-18 16:56 ` Sverre Rabbelier
2010-07-18 17:22 ` Ævar Arnfjörð Bjarmason
2010-07-18 18:03 ` Ilari Liusvaara
2010-07-19 14:10 ` Nicolas Sebrecht
2010-07-19 16:31 ` Junio C Hamano
2010-07-19 17:23 ` Jay Soffian
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=AANLkTikhhjjRYPY4KWEJWUQjCw4TzhXRMvHRsaQ7BECe@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=trast@student.ethz.ch \
/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).