From: "Santi Béjar" <sbejar@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fmt-merge-msg: detached HEAD
Date: Fri, 26 Jan 2007 11:15:51 +0100 [thread overview]
Message-ID: <8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com> (raw)
In-Reply-To: <7vveiuyup7.fsf@assigned-by-dhcp.cox.net>
On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:
> "Santi Béjar" <sbejar@gmail.com> 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
next prev parent reply other threads:[~2007-01-26 10:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-25 15:36 [PATCH] fmt-merge-msg: detached HEAD Santi Béjar
2007-01-26 0:16 ` Junio C Hamano
2007-01-26 9:45 ` Santi Béjar
2007-01-26 9:59 ` Junio C Hamano
2007-01-26 10:15 ` Santi Béjar [this message]
2007-01-26 23:45 ` Junio C Hamano
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=8aa486160701260215p6a0af653qf110aa2679452c6@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
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).