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

On 2022-12-04 15:13:52 +0000, Phillip Wood wrote:
> On 02/12/2022 17:01, Vincent Lefevre wrote:
> > First, one issue is that this is not documented (I was not aware of
> > the notion of trailers, well, at least concerning a special handling
> > by Git).
> They are mentioned in the documentation for 'git commit' see the --signoff
> and --trailer options. The main reference is 'git interpret-trailers'

This issue occurs with "git cherry-pick -x", so that one could expect
documentation there. Since I don't use trailers (this was a false
positive), I wouldn't have the idea to look at the --trailer

> > Then perhaps there should be some configuration to define which
> > tokens are allowed (or forbidden) for trailers. For instance,
> > I would say that "Note" is too common in log messages to be
> > regarded as a trailer token.
> There are some safeguards when looking for trailers (see the
> interpret-trailers man page) I think you have been unlucky here, I don't
> remember this being reported before. I've cc'd Christian who knows more
> about trailers than I do to see if he has anything to add.

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.

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-04 15:53 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 [this message]
2022-12-05 12:56         ` Christian Couder
2022-12-16  1:15           ` Vincent Lefevre

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