Documentation/git-push: Explain status output in more detail
Mention the effects of the receive.deny* family of options for the "remote rejected" case. While there, also split up the explanation into an easier-to-parse list format. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Jul 24, 2010 at 18:03 UTC
9a9fb5d3c4c8601beb2d7b8e3b9283c6c3815a2d
1 file changed
+23
-10
Documentation/git-push.txt
+23
-10
@@ -200,16 +200,29 @@ summary::
200
For a successfully pushed ref, the summary shows the old and new
201
values of the ref in a form suitable for using as an argument to
202
`git log` (this is `<old>..<new>` in most cases, and
203
- `<old>...<new>` for forced non-fast-forward updates). For a
204
- failed update, more details are given for the failure.
205
- The string `rejected` indicates that git did not try to send the
206
- ref at all (typically because it is not a fast-forward). The
207
- string `remote rejected` indicates that the remote end refused
208
- the update; this rejection is typically caused by a hook on the
209
- remote side. The string `remote failure` indicates that the
210
- remote end did not report the successful update of the ref
211
- (perhaps because of a temporary error on the remote side, a
212
- break in the network connection, or other transient error).
203
+ `<old>...<new>` for forced non-fast-forward updates).
204
++
205
+For a failed update, more details are given:
206
++
207
+--
208
+rejected::
209
+ Git did not try to send the ref at all, typically because it
210
+ is not a fast-forward and you did not force the update.
211
+
212
+remote rejected::
213
+ The remote end refused the update. Usually caused by a hook
214
+ on the remote side, or because the remote repository has one
215
+ of the following safety options in effect:
216
+ `receive.denyCurrentBranch` (for pushes to the checked out
217
+ branch), `receive.denyNonFastForwards` (for forced
218
+ non-fast-forward updates), `receive.denyDeletes` or
219
+ `receive.denyDeleteCurrent`. See linkgit:git-config[1].
220
+
221
+remote failure::
222
+ The remote end did not report the successful update of the ref,
223
+ perhaps because of a temporary error on the remote side, a
224
+ break in the network connection, or other transient error.
225
+--
226
227
from::
228
The name of the local ref being pushed, minus its