Autogenerated HTML docs for v2.21.0-896-g6a6c0f

1 files changed, 14 insertions, 1 deletions

diff --git a/git-pull.html b/git-pull.html
index 521962b32..2062000b3 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -893,6 +893,18 @@ updated behaviour, the environment variable <code>GIT_MERGE_AUTOEDIT</code> can
 set to <code>no</code> at the beginning of them.</p></div>

 </dd>

 <dt class="hdlist1">

+--cleanup=&lt;mode&gt;

+</dt>

+<dd>

+<p>

+        This option determines how the merge message will be cleaned up before

+        commiting. See <a href="git-commit.html">git-commit(1)</a> for more details. In addition, if

+        the <em>&lt;mode&gt;</em> is given a value of <code>scissors</code>, scissors will be appended

+        to <code>MERGE_MSG</code> before being passed on to the commit machinery in the

+        case of a merge conflict.

+</p>

+</dd>

+<dt class="hdlist1">

 --ff

 </dt>

 <dd>

@@ -1327,7 +1339,8 @@ documented in <a href="git-config.html">git-config(1)</a>.</p></div>
 <p>

         Transmit the given string to the server when communicating using

         protocol version 2.  The given string must not contain a NUL or LF

-        character.

+        character.  The server&#8217;s handling of server options, including

+        unknown ones, is server-specific.

         When multiple <code>--server-option=&lt;option&gt;</code> are given, they are all

         sent to the other side in the order listed on the command line.

 </p>