summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-09 05:54:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-09 05:54:10 (GMT)
commit105a6339d8454d3856099f6ccea14435a05e2268 (patch)
treeae998ef88c0b1cd495c1fd354902e6d9a74e8974 /Documentation
parent720c9f7bda20d8f307745772374647c1a2076b3d (diff)
parente33cc592deae8132936eea119554799e1039bc0f (diff)
downloadgit-105a6339d8454d3856099f6ccea14435a05e2268.zip
git-105a6339d8454d3856099f6ccea14435a05e2268.tar.gz
git-105a6339d8454d3856099f6ccea14435a05e2268.tar.bz2
Merge branch 'maint'
* maint: blame: prevent a segv when -L given start > EOF git-push: document all the status flags used in the output Fix parsing of imap.preformattedHTML and imap.sslverify git-add documentation: Fix shell quoting example
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-add.txt2
-rw-r--r--Documentation/git-push.txt15
2 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index f74fcf3..51cbeb7 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -153,7 +153,7 @@ EXAMPLES
and its subdirectories:
+
------------
-$ git add Documentation/\\*.txt
+$ git add Documentation/\*.txt
------------
+
Note that the asterisk `\*` is quoted from the shell in this
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 73a921c..bd79119 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -176,12 +176,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