summaryrefslogtreecommitdiffstats
path: root/git-push.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
commit3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch)
tree2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-push.html
parente1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff)
downloadgit-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-push.html')
-rw-r--r--git-push.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-push.html b/git-push.html
index d80cbfb17..035e6ad95 100644
--- a/git-push.html
+++ b/git-push.html
@@ -367,14 +367,14 @@ be named. If <tt>:</tt>&lt;dst&gt; is omitted, the same ref as &lt;src&gt; will
updated.</p></div>
<div class="para"><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>&#43;</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
+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="para"><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="para"><p>Pushing an empty &lt;src&gt; allows you to delete the &lt;dst&gt; ref from
the remote repository.</p></div>
-<div class="para"><p>The special refspec <tt>:</tt> (or <tt>&#43;:</tt> to allow non-fast forward updates)
+<div class="para"><p>The special refspec <tt>:</tt> (or <tt>&#43;:</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
@@ -779,10 +779,10 @@ summary
For a successfully pushed ref, the summary shows the old and new
values of the ref in a form suitable for using as an argument to
<tt>git log</tt> (this is <tt>&lt;old&gt;..&lt;new&gt;</tt> in most cases, and
- <tt>&lt;old&gt;&#8230;&lt;new&gt;</tt> for forced non-fast forward updates). For a
+ <tt>&lt;old&gt;&#8230;&lt;new&gt;</tt> for forced non-fast-forward updates). For a
failed update, more details are given for the failure.
The string <tt>rejected</tt> indicates that git did not try to send the
- ref at all (typically because it is not a fast forward). The
+ ref at all (typically because it is not a fast-forward). The
string <tt>remote rejected</tt> indicates that the remote end refused
the update; this rejection is typically caused by a hook on the
remote side. The string <tt>remote failure</tt> indicates that the
@@ -1001,9 +1001,9 @@ git push origin &#43;dev:master
<dd>
<p>
Update the origin repository's master branch with the dev branch,
- allowing non-fast forward updates. <strong>This can leave unreferenced
+ allowing non-fast-forward updates. <strong>This can leave unreferenced
commits dangling in the origin repository.</strong> Consider the
- following situation, where a fast forward is not possible:
+ following situation, where a fast-forward is not possible:
</p>
<div class="listingblock">
<div class="content">
@@ -1039,7 +1039,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-15 09:57:15 UTC
+Last updated 2009-11-16 02:10:13 UTC
</div>
</div>
</body>