Merge branch 'wk/pull-signoff'

"git pull" has been taught to accept "--[no-]signoff" option and
pass it down to "git merge".

* wk/pull-signoff:
  pull: pass --signoff/--no-signoff to "git merge"

diff --cc Documentation/git-merge.txt
index 3c6927b,0ada8c8..d5dfd84
--- 1/Documentation/git-merge.txt
--- 2/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -64,14 -64,12 +64,6 @@@ OPTION
  -------
  include::merge-options.txt[]
  
- --signoff::
-       Add Signed-off-by line by the committer at the end of the commit
-       log message.  The meaning of a signoff depends on the project,
-       but it typically certifies that committer has
-       the rights to submit this work under the same license and
-       agrees to a Developer Certificate of Origin
-       (see http://developercertificate.org/ for more information).
 --S[<keyid>]::
 ---gpg-sign[=<keyid>]::
 -      GPG-sign the resulting merge commit. The `keyid` argument is
 -      optional and defaults to the committer identity; if specified,
 -      it must be stuck to the option without a space.
--
  -m <msg>::
        Set the commit message to be used for the merge commit (in
        case one is created).

diff --cc Documentation/merge-options.txt
Simple merge