Merge branch 'xx/remote-server-option-config'

A new configuration variable remote.<name>.serverOption makes the
transport layer act as if the --serverOption=<value> option is
given from the command line.

* xx/remote-server-option-config:
  ls-remote: leakfix for not clearing server_options
  fetch: respect --server-option when fetching multiple remotes
  transport.c::handshake: make use of server options from remote
  remote: introduce remote.<name>.serverOption configuration
  transport: introduce parse_transport_option() method

diff --cc Documentation/git-clone.txt
index 9c13f847da3ed25d7420251a947724ba0c06911e,409fb3a3af69a2df1f0281a84a5961fa6e9c6d36..116ad64820114b34e68de72ace30a7f562b599cd
--- 1/Documentation/git-clone.txt
--- 2/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -147,8 -147,11 +147,11 @@@ objects from the source repository int
        protocol version 2.  The given string must not contain a NUL or LF
        character.  The server's handling of server options, including
        unknown ones, is server-specific.
 -      When multiple ++--server-option=++__<option>__ are given, they are all
 +      When multiple `--server-option=<option>` are given, they are all
        sent to the other side in the order listed on the command line.
+       When no ++--server-option=++__<option>__ is given from the command
+       line, the values of configuration variable `remote.<name>.serverOption`
+       are used instead.
  
  `-n`::
  `--no-checkout`::

diff --cc remote.c
Simple merge

diff --cc remote.h
Simple merge