Merge branch 'js/wincred-empty-cred' into maint

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e93624bc8289c835631aab5d5f13dff708..2552ab8e8d5104d09c1c95010ab028068c7d18ae 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -39,9 +39,15 @@ set to `no` at the beginning of them.
 
 --ff-only::
        Refuse to merge and exit with a non-zero status unless the
-       current `HEAD` is already up-to-date or the merge can be
+       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