Merge branch 'ab/send-email-transferencoding-fix'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 6ad1e34afca4cd569798bfcbae9f99d038693b64..0b057cbb100c4a3013b3836f40bb065ebee0b8bd 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -31,7 +31,7 @@ OPTIONS
        displayed.
 
 --refs::
-       Do not show peeled tags or pseudorefs like HEAD in the output.
+       Do not show peeled tags or pseudorefs like `HEAD` in the output.
 
 -q::
 --quiet::
@@ -70,6 +70,14 @@ OPTIONS
        themselves will not work for refs whose objects have not yet been
        fetched from the remote, and will give a `missing object` error.
 
+-o <option>::
+--server-option=<option>::
+       Transmit the given string to the server when communicating using
+       protocol version 2.  The given string must not contain a NUL or LF
+       character.
+       When multiple `--server-option=<option>` are given, they are all
+       sent to the other side in the order listed on the command line.
+
 <repository>::
        The "remote" repository to query.  This parameter can be
        either a URL or the name of a remote (see the GIT URLS and