From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Jan 2026 20:49:31 GMT
Subject: Re: [PATCH v6 4/4] rebase: support --trailer
Message-ID: <xmqqsec0xb50.fsf@gitster.g>
In-Reply-To: <cb5a792f-c763-4fbf-bfcc-52f66c895c9e@app.fastmail.com>

"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:

> On Wed, Nov 5, 2025, at 15:29, Li Chen wrote:
>> From: Li Chen <chenl311@chinatelecom.cn>
> ...
> Same problem as I commented on in https://lore.kernel.org/git/cbe93380-e145-4ebd-a213-928b8c3ba085@app.fastmail.com/
>
> The `See also INCOMPATIBLE OPTIONS below.` is not indented to the same
> level as `--signoff`, where it belongs.
>
>> +--trailer=<trailer>::
>> +       Append the given trailer line(s) to every rebased commit
>> +       message, processed via linkgit:git-interpret-trailers[1].
>> +       When this option is present *rebase automatically implies*
>> +       `--force-rebase` so that fast‑forwarded commits are also
>> +       rewritten.
>> +
>>[snip]


After this and [*] the discussion stopped and the topic has been
dormant since then for full two months.  I'd drop the topic from
'seen' soonish but that does not mean an improved version of this
patch is unwelcome.

Thanks.

[Reference]
 * https://lore.kernel.org/git/19a8fe42354.3909481a3912041.7970296104893780556@linux.beauty/