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
This commit is contained in:
Junio C Hamano
2018-04-25 13:28:51 +09:00
8 changed files with 115 additions and 58 deletions

View File

@@ -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::