]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: support --trailer
authorLi Chen <chenl311@chinatelecom.cn>
Wed, 5 Nov 2025 14:29:44 +0000 (22:29 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2025 17:45:00 +0000 (09:45 -0800)
commit036e2d476c8513037baeb8d627dcbb416417ae02
tree1ff2a1555d25a724e8f2ac047feb586fcba454aa
parent534a87d6f49c6a4313c5b224de40b2d7b47486e1
rebase: support --trailer

Implement a new `--trailer <text>` option for `git rebase`
(support merge backend only now), which appends arbitrary
trailer lines to each rebased commit message.

Reject it if the user passes an option that requires the
apply backend (git am) since it lacks message‑filter/trailer
hook. otherwise we can just use the merge backend.

Automatically set REBASE_FORCE when any trailer is supplied.

And reject invalid input before user edits the interactive file.

Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.adoc
builtin/rebase.c
sequencer.c
sequencer.h
t/meson.build
t/t3440-rebase-trailer.sh [new file with mode: 0755]
trailer.c
trailer.h