summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-08 16:45:21 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-08 16:49:00 -0800
commitb7047abc1213719c225a481f9618ca5a250e6fe9 (patch)
tree03501318502f10fbb0590ef67130a566a550ad41
parent1965ff744a7e4cdefcc467991182b779f3c9d0e8 (diff)
downloadgit-b7047abc1213719c225a481f9618ca5a250e6fe9.tar.gz
git-push: document all the status flags used in the output
We didn't talk about '-' (deletion), '*' (addition), nor '+' (forced). Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-push.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 2653388fd8..5d21ca8850 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -159,12 +159,17 @@ If --porcelain is used, then each line of the output is of the form:
<flag> \t <from>:<to> \t <summary> (<reason>)
-------------------------------
+The status of up-to-date refs is shown only if --porcelain or --verbose
+option is used.
+
flag::
- A single character indicating the status of the ref. This is
- blank for a successfully pushed ref, `!` for a ref that was
- rejected or failed to push, and '=' for a ref that was up to
- date and did not need pushing (note that the status of up to
- date refs is shown only when `git push` is running verbosely).
+ A single character indicating the status of the ref:
+(space);; for a successfully pushed fast-forward;
+`{plus}`;; for a successful forced update;
+`-`;; for a successfully deleted ref;
+`*`;; for a successfully pushed new ref;
+`!`;; for a ref that was rejected or failed to push; and
+`=`;; for a ref that was up to date and did not need pushing.
summary::
For a successfully pushed ref, the summary shows the old and new