Merge branch 'ma/bisect-leakfix'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f394622d653dac84d8e004a5a87ba24821bced1c..3888c3ff85e2dc5b137e4e3ed50e39327760a02a 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -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