git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge: indicate remote tracking branches in merge message

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 9, 2009, 19:36 UTC
Message-ID
<7vprb47pam.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20090809100712.GA26250@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 15 quoted lines
> 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.

Previous: Jeff KingNext: Jeff King
Message 11 of 12 in “merge: indicate remote tracking branches in merge message”
  1. merge: indicate remote tracking branches in merge messageJeff King, Aug 9, 2009
  2. Jeff KingAug 9, 2009
  3. Junio C HamanoAug 9, 2009
  4. Jeff KingAug 9, 2009
  5. Jeff KingAug 9, 2009
  6. Jeff KingAug 9, 2009
  7. 1/3 add tests for merge message headingsJeff King, Aug 9, 2009
  8. 2/3 merge: fix incorrect merge message for ambiguous tag/branchJeff King, Aug 9, 2009
  9. 3/3 merge: indicate remote tracking branches in merge messageJeff King, Aug 9, 2009
  10. Jeff KingAug 9, 2009
  11. Junio C HamanoAug 9, 2009
  12. Jeff KingAug 9, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.