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

Re: [PATCH] fmt-merge-msg: detached HEAD

From
Junio C Hamano <junkio@cox.net>
Date
Jan 26, 2007, 09:59 UTC
Message-ID
<7vveiuyup7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<8aa486160701260145i4c50d564n90967a07f7ee62a9@mail.gmail.com>
"Santi Béjar" <sbejar@gmail.com> writes:
Show 22 quoted lines
>> > diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
>> > index 87d3d63..8cef425 100644
>> > --- a/builtin-fmt-merge-msg.c
>> > +++ b/builtin-fmt-merge-msg.c
>> > @@ -331,7 +331,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
>> >                       printf(" of %s", srcs.list[i]);
>> >       }
>> >
>> > -     if (!strcmp("master", current_branch))
>> > +     if (!strcmp("master", current_branch) ||
>> > +         !strcmp("HEAD", current_branch))
>> >               putchar('\n');
>> >       else
>> >               printf(" into %s\n", current_branch);
>>
>> Hmph.
>>
>> The reason is?
>
> For me, 'Merge ... into master' and 'Merge ... into HEAD' are equally
> useful, so do not show them by default. And git always merges into
> HEAD.

I was wondering if people might prefer rewording it to "into detached HEAD".

Previous: Santi BéjarNext: Santi Béjar
Message 4 of 6 in “fmt-merge-msg: detached HEAD”
  1. fmt-merge-msg: detached HEADSanti Béjar, Jan 25, 2007
  2. Junio C HamanoJan 26, 2007
  3. Santi BéjarJan 26, 2007
  4. Junio C HamanoJan 26, 2007
  5. Santi BéjarJan 26, 2007
  6. Junio C HamanoJan 26, 2007

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.