mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Vincent Lefevre <>
To: Christian Couder <>
Subject: Re: git cherry-pick -x: missing blank line before the "cherry picked from commit" line
Date: Fri, 16 Dec 2022 02:15:53 +0100	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On 2022-12-05 13:56:02 +0100, Christian Couder wrote:
> On Sun, Dec 4, 2022 at 4:49 PM Vincent Lefevre <> wrote:
> > I think that what could be interesting there is a
> > trailer.<token>.separators option (assuming that one can
> > use an empty list of separators to disable a token), but
> > that doesn't exist.
> There is the trailer.separators config option. I am not sure if it
> disables trailers completely though if it is empty. If it doesn't,
> that could be an interesting feature to implement for people who don't
> use trailers at all (except for lines added by cherry-pick).

I have not tried yet, but the drawback is that it could be used
only if trailers are not used at all.

> A trailer.<token>.separators option that disables some <token> when
> empty could be another interesting idea, but it might have drawbacks.
> For example you might disable the "note" token, but then find that
> people sometimes use "notes:" or "NB:" or "PS:" or other things like
> that at the end of their commit messages.

Yes, or "References:" or "https:". Like that, which has just happened
to me: :-(

    (cherry picked from commit 277faface2023449c91c1751630e760d136ae619)

Even when one knows the issue, it is too easy to forget it.

Vincent Lefèvre <> - Web: <>
100% accessible validated (X)HTML - Blog: <>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

      reply	other threads:[~2022-12-16  1:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-02 14:11 git cherry-pick -x: missing blank line before the "cherry picked from commit" line Vincent Lefevre
2022-12-02 16:41 ` Phillip Wood
2022-12-02 17:01   ` Vincent Lefevre
2022-12-04 15:13     ` Phillip Wood
2022-12-04 15:49       ` Vincent Lefevre
2022-12-05 12:56         ` Christian Couder
2022-12-16  1:15           ` Vincent Lefevre [this message]

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).