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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 1/26/07, Junio C Hamano <junkio@xxxxxxx> wrote:
"Santi Béjar" <sbejar@xxxxxxxxx> writes:

>> > 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".

I prefer my patch, but your rewording is OK also.

Santi
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]