Merge branch 'eb/mboxrd-doc' into jch

* eb/mboxrd-doc: Documentation: explain "mboxrd" pretty format
git · Apr 20, 2020 · 97d75c6 · 97d75c6
2 parents 7a730f2 + 88eaf36
commit 97d75c6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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