summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-25 17:25:34 +0900
committerJunio C Hamano <gitster@pobox.com>2018-04-25 17:25:34 +0900
commit96153bf70f5b69b8c480445c9aed3782ef6776a3 (patch)
treee0081b96a5c6731fbb3f2bccce0be798a33c2201 /git-rebase.txt
parentbbb584b1065a684f3ce95ab24b609bd800e6cae1 (diff)
downloadgit-htmldocs-96153bf70f5b69b8c480445c9aed3782ef6776a3.tar.gz
Autogenerated HTML docs for v2.17.0-391-g1f1cd
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index 3277ca143..dd852068b 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -364,9 +364,10 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.
Incompatible with the --interactive option.
--signoff::
- This flag is passed to 'git am' to sign off all the rebased
- commits (see linkgit:git-am[1]). Incompatible with the
- --interactive option.
+ Add a Signed-off-by: trailer to all the rebased commits. Note
+ that if `--interactive` is given then only commits marked to be
+ picked, edited or reworded will have the trailer added. Incompatible
+ with the `--preserve-merges` option.
-i::
--interactive::