diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-07-26 09:02:32 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-07-26 09:02:32 +0000 |
| commit | b4448a8b52a3c13cb4bc2a637d299169c433b6b0 (patch) | |
| tree | 0645daa6070c90f726165b5c951a1ea158f5d7d1 /git-push.html | |
| parent | 08acb7398c92bb884358c5699e57c1c15133b71b (diff) | |
| download | git-htmldocs-b4448a8b52a3c13cb4bc2a637d299169c433b6b0.tar.gz | |
Autogenerated HTML docs for v1.7.2-19-g9a302
Diffstat (limited to 'git-push.html')
| -rw-r--r-- | git-push.html | 49 |
1 files changed, 38 insertions, 11 deletions
diff --git a/git-push.html b/git-push.html index 44a6fdd6e..14ed45b16 100644 --- a/git-push.html +++ b/git-push.html @@ -857,17 +857,44 @@ 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><old>..<new></tt> in most cases, and
- <tt><old>…<new></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
- 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
- remote end did not report the successful update of the ref
- (perhaps because of a temporary error on the remote side, a
- break in the network connection, or other transient error).
+ <tt><old>…<new></tt> for forced non-fast-forward updates).
</p>
+<div class="para"><p>For a failed update, more details are given:</p></div>
+<div class="vlist"><dl>
+<dt>
+rejected
+</dt>
+<dd>
+<p>
+ Git did not try to send the ref at all, typically because it
+ is not a fast-forward and you did not force the update.
+</p>
+</dd>
+<dt>
+remote rejected
+</dt>
+<dd>
+<p>
+ The remote end refused the update. Usually caused by a hook
+ on the remote side, or because the remote repository has one
+ of the following safety options in effect:
+ <tt>receive.denyCurrentBranch</tt> (for pushes to the checked out
+ branch), <tt>receive.denyNonFastForwards</tt> (for forced
+ non-fast-forward updates), <tt>receive.denyDeletes</tt> or
+ <tt>receive.denyDeleteCurrent</tt>. See <a href="git-config.html">git-config(1)</a>.
+</p>
+</dd>
+<dt>
+remote failure
+</dt>
+<dd>
+<p>
+ The remote end did not report the successful update of the ref,
+ perhaps because of a temporary error on the remote side, a
+ break in the network connection, or other transient error.
+</p>
+</dd>
+</dl></div>
</dd>
<dt>
from
@@ -1117,7 +1144,7 @@ by Linus Torvalds <torvalds@osdl.org></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-07-21 21:55:31 UTC
+Last updated 2010-07-26 09:02:12 UTC
</div>
</div>
</body>
|