aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.adoc
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-rebase.adoc')
-rw-r--r--Documentation/git-rebase.adoc8
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: