aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-08 16:49:22 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-08 16:49:22 -0800
commita598331f952b5bd89f72fcf20a44ab3aa2918b3f (patch)
tree81ebd3bbff1a51911d75d1edf346523d7142f9a5 /Documentation/git-push.txt
parent0c15da68e819183fcf85f45daa25965b6fde86cc (diff)
parentb7047abc1213719c225a481f9618ca5a250e6fe9 (diff)
downloadgit-a598331f952b5bd89f72fcf20a44ab3aa2918b3f.tar.gz
git-a598331f952b5bd89f72fcf20a44ab3aa2918b3f.tar.xz
Merge branch 'jc/maint-push-doc-status' into maint
* jc/maint-push-doc-status: git-push: document all the status flags used in the output
Diffstat (limited to 'Documentation/git-push.txt')
-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 52c0538df..ab1bf99fd 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -165,12 +165,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