From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sun, 22 Nov 2009 16:15:31 +0000 (+0100)
Subject: log --format: document %w
X-Git-Tag: v1.6.6-rc0~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3288f20171ce6aee5d9d51d111ee17cd4b426af4;p=git.git

log --format: document %w

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 09462021e..7ff6a6ce2 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -135,6 +135,10 @@ The placeholders are:
 - '%m': left, right or boundary mark
 - '%n': newline
 - '%x00': print a byte from a hex code
+- '%w([<w>[,<i1>[,<i2>]]])': switch line wrapping, like the -w option of
+  linkgit:git-shortlog[1].  NOTE: Color placeholders (`%C*`) are not
+  recognized as having no width, so they should not be put into wrapped
+  sections.
 
 NOTE: Some placeholders may depend on other options given to the
 revision traversal engine. For example, the `%g*` reflog options will