summaryrefslogtreecommitdiffstats
path: root/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-12-01 21:16:59 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-12-01 21:16:59 +0000
commit2bd8a74930f0e0649154186daa892b3daa2211a0 (patch)
tree9c17731b3ad7e078548dd05bf3505558783f9dd3 /pretty-formats.txt
parent8fddeedee69740f179e74fef731c8022dcbee70b (diff)
downloadgit-htmldocs-2bd8a74930f0e0649154186daa892b3daa2211a0.tar.gz
Autogenerated HTML docs for v1.6.6-rc0-114-gc8648
Diffstat (limited to 'pretty-formats.txt')
-rw-r--r--pretty-formats.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/pretty-formats.txt b/pretty-formats.txt
index 0683fb3a3..53a9168ba 100644
--- a/pretty-formats.txt
+++ b/pretty-formats.txt
@@ -144,6 +144,14 @@ insert an empty string unless we are traversing reflog entries (e.g., by
`git log -g`). The `%d` placeholder will use the "short" decoration
format if `--decorate` was not already provided on the command line.
+If you add a `{plus}` (plus sign) after '%' of a placeholder, a line-feed
+is inserted immediately before the expansion if and only if the
+placeholder expands to a non-empty string.
+
+If you add a `-` (minus sign) after '%' of a placeholder, line-feeds that
+immediately precede the expansion are deleted if and only if the
+placeholder expands to an empty string.
+
* 'tformat:'
+
The 'tformat:' format works exactly like 'format:', except that it