summaryrefslogtreecommitdiffstats
path: root/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-07-26 09:02:32 +0000
committerJunio C Hamano <junio@kernel.org>2010-07-26 09:02:32 +0000
commitb4448a8b52a3c13cb4bc2a637d299169c433b6b0 (patch)
tree0645daa6070c90f726165b5c951a1ea158f5d7d1 /git-push.txt
parent08acb7398c92bb884358c5699e57c1c15133b71b (diff)
downloadgit-htmldocs-b4448a8b52a3c13cb4bc2a637d299169c433b6b0.tar.gz
Autogenerated HTML docs for v1.7.2-19-g9a302
Diffstat (limited to 'git-push.txt')
-rw-r--r--git-push.txt33
1 files changed, 23 insertions, 10 deletions
diff --git a/git-push.txt b/git-push.txt
index b68abff28..658ff2ff6 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -200,16 +200,29 @@ 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
`git log` (this is `<old>..<new>` in most cases, and
- `<old>...<new>` for forced non-fast-forward updates). For a
- failed update, more details are given for the failure.
- The string `rejected` indicates that git did not try to send the
- ref at all (typically because it is not a fast-forward). The
- string `remote rejected` indicates that the remote end refused
- the update; this rejection is typically caused by a hook on the
- remote side. The string `remote failure` 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).
+ `<old>...<new>` for forced non-fast-forward updates).
++
+For a failed update, more details are given:
++
+--
+rejected::
+ 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.
+
+remote rejected::
+ 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:
+ `receive.denyCurrentBranch` (for pushes to the checked out
+ branch), `receive.denyNonFastForwards` (for forced
+ non-fast-forward updates), `receive.denyDeletes` or
+ `receive.denyDeleteCurrent`. See linkgit:git-config[1].
+
+remote failure::
+ 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.
+--
from::
The name of the local ref being pushed, minus its