Merge branch 'jk/connect-clear-env' into maint

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index ca039546a463bee511ca3a1c7d301689fb56a412..bccfdf7fde9af8c80203f85d98030f8f38db4994 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -294,7 +294,9 @@ which makes little sense.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
-       GPG-sign commits.
+       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.
 
 -q::
 --quiet::