git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge: indicate remote tracking branches in merge message
Date: Sun, 09 Aug 2009 12:36:17 -0700	[thread overview]
Message-ID: <7vprb47pam.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20090809100712.GA26250@coredump.intra.peff.net> (Jeff King's message of "Sun\, 9 Aug 2009 06\:07\:12 -0400")

Jeff King <peff@peff.net> writes:

> On Sun, Aug 09, 2009 at 06:00:45AM -0400, Jeff King wrote:
>
>>   [1/3] add tests for merge message headings
>>   [2/3] merge: fix incorrect merge message for ambiguous tag/branch
>>   [3/3] merge: indicate remote tracking branches in merge message
>
> And here is the 4/3 you mentioned earlier:
>
> -- >8 --
> Subject: [PATCH] merge: describe tags as such in merge message
>
> Previously, merging a tag directly via "git merge tag" would
> get you the message "Merge commit 'tag'". It is a little
> more descriptive to note that it was actually a tag (i.e.,
> "Merge tag 'tag'").

Maybe "Merge version 'v1.6.3'" or "Merge commit tagged as 'v1.6.3'"? 
I dunno.

  reply	other threads:[~2009-08-09 19:36 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-09  6:59 [PATCH] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09  7:14 ` Jeff King
2009-08-09  7:31 ` Junio C Hamano
2009-08-09  7:40   ` Jeff King
2009-08-09  9:14     ` Jeff King
2009-08-09 10:00       ` Jeff King
2009-08-09 10:01         ` [PATCH 1/3] add tests for merge message headings Jeff King
2009-08-09 10:02         ` [PATCH 2/3] merge: fix incorrect merge message for ambiguous tag/branch Jeff King
2009-08-09 10:02         ` [PATCH 3/3] merge: indicate remote tracking branches in merge message Jeff King
2009-08-09 10:07         ` [PATCH] " Jeff King
2009-08-09 19:36           ` Junio C Hamano [this message]
2009-08-09 21:49             ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vprb47pam.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).