All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge: allow to pretend a merge into detached HEAD is made into a branch
Date: Sat, 18 Dec 2021 11:24:17 +0300	[thread overview]
Message-ID: <87a6gyiamm.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqbl1ezq5j.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 17 Dec 2021 16:56:56 -0800")

Junio C Hamano <gitster@pobox.com> writes:

[...]

> Teach the "--detached-head-name=<branch>" option to "git merge" and
> its underlying "git fmt-merge-message", to pretend as if we were
> merging into <branch> (instead of HEAD) when they prepare the merge
> message.  The pretend name honors the usual "into <target>"
> suppression mechanism, which can be seen in the tests added here.

I think renaming destination branch in the commit message is useful in
general, and should not be limited to merging to detached head. Please
consider to introduce something like "--into-name=<name>" instead, that
will do this renaming unconditionally.

Also, being an advocate for eventual abandoning of "detached head" from
Git terminology, I'd prefer to see more neutral name for the option
anyway.

Thanks,
-- Sergey Organov

  reply	other threads:[~2021-12-18  8:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-18  0:56 [PATCH] merge: allow to pretend a merge into detached HEAD is made into a branch Junio C Hamano
2021-12-18  8:24 ` Sergey Organov [this message]
2021-12-20 15:55   ` Junio C Hamano
2021-12-20 22:53     ` [PATCH v2] merge: allow to pretend a merge is made into a different branch Junio C Hamano
2021-12-21 13:52       ` Derrick Stolee
2021-12-18 10:27 ` [PATCH] merge: allow to pretend a merge into detached HEAD is made into a branch Ævar Arnfjörð Bjarmason
2021-12-20 15:36   ` Derrick Stolee
2021-12-20 15:57     ` 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=87a6gyiamm.fsf@osv.gnss.ru \
    --to=sorganov@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.