diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4df6431c34..3c6927b1fb 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -72,12 +72,6 @@ include::merge-options.txt[]
 	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 --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 4e32304301..2552ab8e8d 100644
--- 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