summaryrefslogtreecommitdiffstats
path: root/git-push.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
commitb76a68630eaab75c4eb1c41f0fc091811854ff43 (patch)
tree5be60264e80970f60d9c56b410c8828693be8588 /git-push.html
parent0aadbc37c068365a09926cd895863c4a725b45d6 (diff)
downloadgit-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-push.html')
-rw-r--r--git-push.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-push.html b/git-push.html
index 3bbc51bce..5a760de32 100644
--- a/git-push.html
+++ b/git-push.html
@@ -617,7 +617,7 @@ documentation for <a href="git-receive-pack.html">git-receive-pack(1)</a>.</p></
<dd>
<p>
The format of a &lt;refspec&gt; parameter is an optional plus
- <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed
+ <tt>+</tt>, followed by the source ref &lt;src&gt;, followed
by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.
It is used to specify with what &lt;src&gt; object the &lt;dst&gt; ref
in the remote repository is to be updated.
@@ -631,14 +631,14 @@ be named. If <tt>:</tt>&lt;dst&gt; is omitted, the same ref as &lt;src&gt; will
updated.</p></div>
<div class="paragraph"><p>The object referenced by &lt;src&gt; is used to update the &lt;dst&gt; reference
on the remote side, but by default this is only allowed if the
-update can fast-forward &lt;dst&gt;. By having the optional leading <tt>&#43;</tt>,
+update can fast-forward &lt;dst&gt;. By having the optional leading <tt>+</tt>,
you can tell git to update the &lt;dst&gt; ref even when the update is not a
fast-forward. This does <strong>not</strong> attempt to merge &lt;src&gt; into &lt;dst&gt;. See
EXAMPLES below for details.</p></div>
<div class="paragraph"><p><tt>tag &lt;tag&gt;</tt> means the same as <tt>refs/tags/&lt;tag&gt;:refs/tags/&lt;tag&gt;</tt>.</p></div>
<div class="paragraph"><p>Pushing an empty &lt;src&gt; allows you to delete the &lt;dst&gt; ref from
the remote repository.</p></div>
-<div class="paragraph"><p>The special refspec <tt>:</tt> (or <tt>&#43;:</tt> to allow non-fast-forward updates)
+<div class="paragraph"><p>The special refspec <tt>:</tt> (or <tt>+:</tt> to allow non-fast-forward updates)
directs git to push "matching" branches: for every branch that exists on
the local side, the remote side is updated if a branch of the same name
already exists on the remote side. This is the default operation mode
@@ -662,7 +662,7 @@ nor in any Push line of the corresponding remotes file---see below).</p></div>
Remove remote branches that don&#8217;t have a local counterpart. For example
a remote branch <tt>tmp</tt> will be removed if a local branch with the same
name doesn&#8217;t exist any more. This also respects refspecs, e.g.
- <tt>git push --prune remote refs/heads/&#42;:refs/tmp/&#42;</tt> would
+ <tt>git push --prune remote refs/heads/*:refs/tmp/*</tt> would
make sure that remote <tt>refs/tmp/foo</tt> will be removed if <tt>refs/heads/foo</tt>
doesn&#8217;t exist.
</p>
@@ -1100,7 +1100,7 @@ for a successfully pushed fast-forward;
</p>
</dd>
<dt class="hdlist1">
-<tt>&#43;</tt>
+<tt>+</tt>
</dt>
<dd>
<p>
@@ -1387,7 +1387,7 @@ the ones in the examples below) can be configured as the default for
</p>
</dd>
<dt class="hdlist1">
-<tt>git push origin &#43;dev:master</tt>
+<tt>git push origin +dev:master</tt>
</dt>
<dd>
<p>
@@ -1423,7 +1423,7 @@ a <tt>git gc</tt> command on the origin repository.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-24 15:16:09 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>