Merge branch 'eb/mboxrd-doc'

Doc update. * eb/mboxrd-doc: Documentation: explain "mboxrd" pretty format
2020-04-28 15:50:06 -07:00 · 2020-04-28 15:50:06 -07:00 · e08387d321
parent e81ecff10a 88eaf361e0
commit e08387d321
1 changed files with 6 additions and 0 deletions
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@ -83,6 +83,12 @@ placeholders, its output is not affected by other options like

 	  <full commit message>

+* 'mboxrd'
+
+Like 'email', but lines in the commit message starting with "From "
+(preceded by zero or more ">") are quoted with ">" so they aren't
+confused as starting a new commit.
+
 * 'raw'
 +
 The 'raw' format shows the entire commit exactly as