From: Junio C Hamano Date: Tue, 9 Feb 2010 00:49:22 +0000 (-0800) Subject: Merge branch 'jc/maint-push-doc-status' into maint X-Git-Tag: v1.6.6.2~12 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a598331f952b5bd89f72fcf20a44ab3aa2918b3f?hp=0c15da68e819183fcf85f45daa25965b6fde86cc 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 --- diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 52c0538df5..ab1bf99fdb 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: \t : \t () ------------------------------- +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