Merge branch 'mo/maint-crlf-doc'

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 38b9904791466152a98ab3df7c5b84ac66dbac73..7ff6a6ce22f735fa40b2b2d1ec3f66f9bce9cc64 100644 (file)
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -123,6 +123,7 @@ The placeholders are:
 - '%s': subject
 - '%f': sanitized subject line, suitable for a filename
 - '%b': body
+- '%N': commit notes
 - '%gD': reflog selector, e.g., `refs/stash@\{1\}`
 - '%gd': shortened reflog selector, e.g., `stash@\{1\}`
 - '%gs': reflog subject
@@ -134,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