diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:28:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 04:28:51 (GMT) |
| commit | 850e9257525ef2fa13e1d34ccce4e6b73085bb4e (patch) | |
| tree | 9de3df7ba23ef1db1b95d1a51d98f00ce784711f /Documentation | |
| parent | d892beef52a293b271538481dbc76014672ddf09 (diff) | |
| parent | da27a6fbd50861149b32cfd1f9e5c36a935c575a (diff) | |
| download | git-850e9257525ef2fa13e1d34ccce4e6b73085bb4e.zip git-850e9257525ef2fa13e1d34ccce4e6b73085bb4e.tar.gz git-850e9257525ef2fa13e1d34ccce4e6b73085bb4e.tar.bz2 | |
Merge branch 'pw/rebase-signoff'
"git rebase" has learned to honor "--signoff" option when using
backends other than "am" (but not "--preserve-merges").
* pw/rebase-signoff:
rebase --keep-empty: always use interactive rebase
rebase -p: error out if --signoff is given
rebase: extend --signoff support
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3277ca1..dd85206 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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:: |