Autogenerated HTML docs for v1.7.1-rc2

1 files changed, 37 insertions, 34 deletions

diff --git a/git-push.html b/git-push.html
index 125bb436c..6929b6fcd 100644
--- a/git-push.html
+++ b/git-push.html
@@ -563,93 +563,96 @@ useful if you write an alias or script around <em>git push</em>.</p></div>
 </div>

 <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>

 <div class="sectionbody">

-<div class="para"><p>One of the following notations can be used

-to name the remote repository:</p></div>

+<div class="para"><p>In general, URLs contain information about the transport protocol, the

+address of the remote server, and the path to the repository.

+Depending on the transport protocol, some of this information may be

+absent.</p></div>

+<div class="para"><p>Git natively supports ssh, git, http, https, ftp, ftps, and rsync

+protocols. The following syntaxes may be used with them:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

-rsync://host.xz/path/to/repo.git/

+ssh://&#91;user@&#93;host.xz&#91;:port&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-http://host.xz&#91;:port&#93;/path/to/repo.git/

+git://host.xz&#91;:port&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-https://host.xz&#91;:port&#93;/path/to/repo.git/

+http&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-git://host.xz&#91;:port&#93;/path/to/repo.git/

+ftp&#91;s&#93;://host.xz&#91;:port&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-git://host.xz&#91;:port&#93;/~user/path/to/repo.git/

+rsync://host.xz/path/to/repo.git/

 </p>

 </li>

+</ul></div>

+<div class="para"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div>

+<div class="ilist"><ul>

 <li>

 <p>

-ssh://&#91;user@&#93;host.xz&#91;:port&#93;/path/to/repo.git/

+&#91;user@&#93;host.xz:path/to/repo.git/

 </p>

 </li>

+</ul></div>

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

+<div class="ilist"><ul>

 <li>

 <p>

-ssh://&#91;user@&#93;host.xz/path/to/repo.git/

+ssh://&#91;user@&#93;host.xz&#91;:port&#93;/~&#91;user&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-ssh://&#91;user@&#93;host.xz/~user/path/to/repo.git/

+git://host.xz&#91;:port&#93;/~&#91;user&#93;/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-ssh://&#91;user@&#93;host.xz/~/path/to/repo.git

+&#91;user@&#93;host.xz:/~&#91;user&#93;/path/to/repo.git/

 </p>

 </li>

 </ul></div>

-<div class="para"><p>SSH is the default transport protocol over the network.  You can

-optionally specify which user to log-in as, and an alternate,

-scp-like syntax is also supported.  Both syntaxes support

-username expansion, as does the native git protocol, but

-only the former supports port specification. The following

-three are identical to the last three above, respectively:</p></div>

+<div class="para"><p>For local respositories, also supported by git natively, the following

+syntaxes may be used:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

-&#91;user@&#93;host.xz:/path/to/repo.git/

-</p>

-</li>

-<li>

-<p>

-&#91;user@&#93;host.xz:~user/path/to/repo.git/

+/path/to/repo.git/

 </p>

 </li>

 <li>

 <p>

-&#91;user@&#93;host.xz:path/to/repo.git

+file:///path/to/repo.git/

 </p>

 </li>

 </ul></div>

-<div class="para"><p>To sync with a local directory, you can use:</p></div>

+<div class="para"><p>These two syntaxes are mostly equivalent, except when cloning, when

+the former implies --local option. See <a href="git-clone.html">git-clone(1)</a> for

+details.</p></div>

+<div class="para"><p>When git doesn't know how to handle a certain transport protocol, it

+attempts to use the <em>remote-&lt;transport&gt;</em> remote helper, if one

+exists. To explicitly request a remote helper, the following syntax

+may be used:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

-/path/to/repo.git/

-</p>

-</li>

-<li>

-<p>

-file:///path/to/repo.git/

+&lt;transport&gt;::&lt;address&gt;

 </p>

 </li>

 </ul></div>

-<div class="para"><p>They are mostly equivalent, except when cloning.  See

-<a href="git-clone.html">git-clone(1)</a> for details.</p></div>

+<div class="para"><p>where &lt;address&gt; may be a path, a server and path, or an arbitrary

+URL-like string recognized by the specific remote helper being

+invoked. See <a href="git-remote-helpers.html">git-remote-helpers(1)</a> for details.</p></div>

 <div class="para"><p>If there are a large number of similarly-named remote repositories and

 you want to use a different format for them (such that the URLs you

 use will be rewritten into URLs that work), you can create a

@@ -1114,7 +1117,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-04-10 07:53:21 UTC

+Last updated 2010-04-19 06:46:04 UTC

 </div>

 </div>

 </body>