diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:33:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:33:30 -0800 |
| commit | 1fdffa616119aeb607e211a77688c9bc3883ca87 (patch) | |
| tree | ab7ac6c27518735c1481d54b98d9190ce836e6fd /Documentation | |
| parent | d2cd66556dba1ab848cfad7b0eed049b08957b12 (diff) | |
| parent | 8a3c63e01d2b1df471beafff5fb78df4bade9388 (diff) | |
| download | git-1fdffa616119aeb607e211a77688c9bc3883ca87.tar.gz git-1fdffa616119aeb607e211a77688c9bc3883ca87.tar.xz | |
Merge branch 'rs/color-escape-has-zero-width'
* rs/color-escape-has-zero-width:
strbuf_add_wrapped_text(): skip over colour codes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 7ff6a6ce2..0683fb3a3 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -136,9 +136,7 @@ The placeholders are: - '%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. + linkgit:git-shortlog[1]. NOTE: Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will |