global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lc/rebase-trailer' into jch

Browse Source 
"git rebase" learns "--trailer" command to drive the
interpret-trailers machinery.

Comments?

* 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
This commit is contained in:
Junio C Hamano
2026-03-11 14:57:57 -07:00
parent 4f629ada00 e4f9d6b0ab
commit eeaef6dc77
11 changed files with 459 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-rebase.adoc
View File

@@ -497,6 +497,13 @@ See also INCOMPATIBLE OPTIONS below.
+
See also INCOMPATIBLE OPTIONS below.
--trailer=<trailer>::
Append the given trailer to every rebased commit message, processed
via linkgit:git-interpret-trailers[1]. This option implies
`--force-rebase`.
+
See also INCOMPATIBLE OPTIONS below.
-i::
--interactive::
Make a list of the commits which are about to be rebased. Let the
@@ -653,6 +660,7 @@ are incompatible with the following options:
* --[no-]reapply-cherry-picks when used without --keep-base
* --update-refs
* --root when used without --onto
* --trailer
In addition, the following pairs of options are incompatible: