Merge branch 'maint'

* maint:
Documentation: Clarify '--signoff' for git-commit

diff --combined Documentation/git-commit.txt
index eb05b0f49b0c513581150415d1a4e679d7bfbea6,79be4f1c0086fd1193734412019feeef8b07d669..41809eecab9750746d2df4a0e148f09796e90224
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -75,10 -75,8 +75,10 @@@ OPTION
        read the message from the standard input.
  
  --author=<author>::
 -      Override the author name used in the commit.  Use
 -      `A U Thor <author@example.com>` format.
 +      Override the author name used in the commit.  You can use the
 +      standard `A U Thor <author@example.com>` format.  Otherwise,
 +      an existing commit that matches the given string and its author
 +      name is used.
  
  -m <msg>::
  --message=<msg>::
@@@ -94,7 -92,8 +94,8 @@@
  
  -s::
  --signoff::
-       Add Signed-off-by line at the end of the commit message.
+       Add Signed-off-by line by the commiter at the end of the commit
+       log message.
  
  -n::
  --no-verify::