Autogenerated HTML docs for v1.8.3-182-gb2edae

1 files changed, 12 insertions, 4 deletions

diff --git a/git-pull.html b/git-pull.html
index 35be5fa43..38d4f8275 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -868,6 +868,9 @@ inspect and further tweak the merge result before committing.</p></div>
 --edit

 </dt>

 <dt class="hdlist1">

+-e

+</dt>

+<dt class="hdlist1">

 --no-edit

 </dt>

 <dd>

@@ -876,7 +879,7 @@ inspect and further tweak the merge result before committing.</p></div>
         further edit the auto-generated merge message, so that the user

         can explain and justify the merge. The <code>--no-edit</code> option can be

         used to accept the auto-generated message (this is generally

-        discouraged). The <code>--edit</code> option is still useful if you are

+        discouraged). The <code>--edit</code> (or <code>-e</code>) option is still useful if you are

         giving a draft message with the <code>-m</code> option from the command line

         and want to edit it in the editor.

 </p>

@@ -1308,9 +1311,9 @@ is often useful.</td>
 </li>

 <li>

 <p>

-A parameter &lt;ref&gt; without a colon is equivalent to

-  &lt;ref&gt;: when pulling/fetching, so it merges &lt;ref&gt; into the current

-  branch without storing the remote branch anywhere locally

+A parameter &lt;ref&gt; without a colon merges &lt;ref&gt; into the current

+  branch,

+  and updates the remote-tracking branches (if any).

 </p>

 </li>

 </ul></div>

@@ -1366,6 +1369,11 @@ rsync://host.xz/path/to/repo.git/
 </p>

 </li>

 </ul></div>

+<div class="paragraph"><p>This syntax is only recognized if there are no slashes before the

+first colon. This helps differentiate a local path that contains a

+colon. For example the local path <code>foo:bar</code> could be specified as an

+absolute path or <code>./foo:bar</code> to avoid being misinterpreted as an ssh

+url.</p></div>

 <div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div>

 <div class="ulist"><ul>

 <li>