diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-19 09:54:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-19 09:54:56 -0700 |
| commit | accd0e107bb36cbcdb158f8bb19d5bae589294a9 (patch) | |
| tree | 9c127dab3844830d92aaf884a0f1037d11d5a3c3 /Documentation | |
| parent | a7a079c2c4bc7b269229a6ea6c147b6b2d5b2684 (diff) | |
| parent | e4f9d6b0ab2e1903765258991a6265599d0007ce (diff) | |
| download | git-accd0e107bb36cbcdb158f8bb19d5bae589294a9.tar.xz | |
Merge branch 'lc/rebase-trailer'
"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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.adoc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc index e177808004..f6c22d1598 100644 --- a/Documentation/git-rebase.adoc +++ b/Documentation/git-rebase.adoc @@ -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: |