Merge branch 'maint'

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 51c63d66761d76e5edeadbada4fe66be99ba7a22..7f34a5b33103ed1c870f234687079badc393be77 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -314,7 +314,9 @@ changes to tracked files.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
-       GPG-sign commit.
+       GPG-sign commits. The `keyid` argument is optional and
+       defaults to the committer identity; if specified, it must be
+       stuck to the option without a space.
 
 --no-gpg-sign::
        Countermand `commit.gpgSign` configuration variable that is