diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
commit | abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch) | |
tree | 85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /git-push.html | |
parent | 085534867cb82e0690945a1645554999bcfa542a (diff) | |
download | git-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz |
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'git-push.html')
-rw-r--r-- | git-push.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-push.html b/git-push.html index f2c3d66ab..acc43a4f4 100644 --- a/git-push.html +++ b/git-push.html @@ -799,10 +799,11 @@ push. Arbitrary expressions cannot be used here, an actual ref must be named. If <code>:</code><dst> is omitted, the same ref as <src> will be
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 <code>+</code>,
-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
+on the remote side. By default this is only allowed if <dst> is not
+a tag (annotated or lightweight), and then only if it can fast-forward
+<dst>. By having the optional leading <code>+</code>, you can tell git to update
+the <dst> ref even if it is not allowed by default (e.g., it 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><code>tag <tag></code> means the same as <code>refs/tags/<tag>:refs/tags/<tag></code>.</p></div>
<div class="paragraph"><p>Pushing an empty <src> allows you to delete the <dst> ref from
@@ -1630,7 +1631,7 @@ a <code>git gc</code> command on the origin repository.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-29 14:50:58 PST
+Last updated 2013-01-06 01:05:36 PST
</div>
</div>
</body>
|