Merge branch 'vv/merge-squash-with-explicit-commit'

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 2fd12524f95afef9c688d3402cd2a8b6d2d98c2e..a0f14b51f2654ced2fb7f76078d95050d2730a7d 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -131,6 +131,14 @@ objects from the source repository into a pack in the cloned repository.
        is specified. This flag forces progress status even if the
        standard error stream is not directed to a terminal.
 
+--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.  The server's handling of server options, including
+       unknown ones, is server-specific.
+       When multiple `--server-option=<option>` are given, they are all
+       sent to the other side in the order listed on the command line.
+
 --no-checkout::
 -n::
        No checkout of HEAD is performed after the clone is complete.