diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 15:02:46 -0700 |
commit | b76a68630eaab75c4eb1c41f0fc091811854ff43 (patch) | |
tree | 5be60264e80970f60d9c56b410c8828693be8588 /git-push.html | |
parent | 0aadbc37c068365a09926cd895863c4a725b45d6 (diff) | |
download | git-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.html | 14 |
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 <refspec> parameter is an optional plus
- <tt>+</tt>, followed by the source ref <src>, followed
+ <tt>+</tt>, followed by the source ref <src>, followed
by a colon <tt>:</tt>, followed by the destination ref <dst>.
It is used to specify with what <src> object the <dst> ref
in the remote repository is to be updated.
@@ -631,14 +631,14 @@ be named. If <tt>:</tt><dst> is omitted, the same ref as <src> will updated.</p></div>
<div class="paragraph"><p>The object referenced by <src> is used to update the <dst> reference
on the remote side, but by default this is only allowed if the
-update can fast-forward <dst>. By having the optional leading <tt>+</tt>,
+update can fast-forward <dst>. By having the optional leading <tt>+</tt>,
you can tell git to update the <dst> ref even when the update is not a
fast-forward. This does <strong>not</strong> attempt to merge <src> into <dst>. See
EXAMPLES below for details.</p></div>
<div class="paragraph"><p><tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>.</p></div>
<div class="paragraph"><p>Pushing an empty <src> allows you to delete the <dst> ref from
the remote repository.</p></div>
-<div class="paragraph"><p>The special refspec <tt>:</tt> (or <tt>+:</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’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’t exist any more. This also respects refspecs, e.g.
- <tt>git push --prune remote refs/heads/*:refs/tmp/*</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’t exist.
</p>
@@ -1100,7 +1100,7 @@ for a successfully pushed fast-forward; </p>
</dd>
<dt class="hdlist1">
-<tt>+</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 +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>
|