]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'lc/rebase-trailer'
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Mar 2026 16:54:56 +0000 (09:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Mar 2026 16:54:56 +0000 (09:54 -0700)
"git rebase" learns "--trailer" command to drive the
interpret-trailers machinery.

* lc/rebase-trailer:
  rebase: support --trailer
  commit, tag: parse --trailer with OPT_STRVEC
  trailer: append trailers without fork/exec
  trailer: libify a couple of functions
  interpret-trailers: refactor create_in_place_tempfile()
  interpret-trailers: factor trailer rewriting

1  2 
builtin/commit.c
builtin/rebase.c
sequencer.c
t/meson.build

Simple merge
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc t/meson.build
Simple merge