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 --combined Documentation/git-merge.txt
index 3c6927b1fb87940c53ff01339a297d6b85dc1676,0ada8c856b786b617841314a6048321644713ad6..d5dfd8430f3370dc168e42e3991d1d4a9b854617
--- 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 --combined Documentation/merge-options.txt
index 2552ab8e8d5104d09c1c95010ab028068c7d18ae,f394622d653dac84d8e004a5a87ba24821bced1c..3888c3ff85e2dc5b137e4e3ed50e39327760a02a
--- 1/Documentation/merge-options.txt
--- 2/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -42,12 -42,6 +42,12 @@@ set to `no` at the beginning of them
        current `HEAD` is already up to date or the merge can be
        resolved as a fast-forward.
  
 +-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.
 +
  --log[=<n>]::
  --no-log::
        In addition to branch names, populate the log message with
@@@ -57,6 -51,16 +57,16 @@@
  With --no-log do not list one-line descriptions from the
  actual commits being merged.
  
+ --signoff::
+ --no-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).
+ +
+ With --no-signoff do not add a Signed-off-by line.
  
  --stat::
  -n::