diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-18 14:34:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-18 14:34:11 -0800 |
| commit | c3550300ac1c21885d850527c7f5f1d9c1291d82 (patch) | |
| tree | 178d3cb658ac60bc011a6ee048fce9ee26c808bf /git-remote.html | |
| parent | 6bb32e61faff1d96d84d668f44b4440210b0e23c (diff) | |
| download | git-htmldocs-c3550300ac1c21885d850527c7f5f1d9c1291d82.tar.gz | |
Autogenerated HTML docs for v2.3.0-149-gf3f40
Diffstat (limited to 'git-remote.html')
| -rw-r--r-- | git-remote.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/git-remote.html b/git-remote.html index 6a96063f4..dcf05fbf3 100644 --- a/git-remote.html +++ b/git-remote.html @@ -893,15 +893,21 @@ branches, adds to that list.</p></div> </dt>
<dd>
<p>
-Changes URL remote points to. Sets first URL remote points to matching
+Changes URLs for the remote. Sets first URL for remote <name> that matches
regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If
-<oldurl> doesn’t match any URL, error occurs and nothing is changed.
+<oldurl> doesn’t match any URL, an error occurs and nothing is changed.
</p>
<div class="paragraph"><p>With <em>--push</em>, push URLs are manipulated instead of fetch URLs.</p></div>
-<div class="paragraph"><p>With <em>--add</em>, instead of changing some URL, new URL is added.</p></div>
-<div class="paragraph"><p>With <em>--delete</em>, instead of changing some URL, all URLs matching
-regex <url> are deleted. Trying to delete all non-push URLs is an
-error.</p></div>
+<div class="paragraph"><p>With <em>--add</em>, instead of changing existing URLs, new URL is added.</p></div>
+<div class="paragraph"><p>With <em>--delete</em>, instead of changing existing URLs, all URLs matching
+regex <url> are deleted for remote <name>. Trying to delete all
+non-push URLs is an error.</p></div>
+<div class="paragraph"><p>Note that the push URL and the fetch URL, even though they can
+be set differently, must still refer to the same place. What you
+pushed to the push URL should be what you would see if you
+immediately fetched from the fetch URL. If you are trying to
+fetch from one place (e.g. your upstream) and push to another (e.g.
+your publishing repository), use two separate remotes.</p></div>
</dd>
<dt class="hdlist1">
<em>show</em>
@@ -1020,7 +1026,7 @@ $ git merge origin</code></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-02-27 15:06:29 PST
+Last updated 2015-02-18 14:33:44 PST
</div>
</div>
</body>
|