summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-28 22:50:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-28 22:50:06 (GMT)
commite08387d32146337e97a9112ed3348f2e3bc3f9f5 (patch)
treea8d545ee5231f23f6ce2b65b945161713001b4cd /Documentation
parente81ecff10a19acea0bf58a260e919b1920925108 (diff)
parent88eaf361e04fe10a3ffd9f6af466a993e926b45e (diff)
downloadgit-e08387d32146337e97a9112ed3348f2e3bc3f9f5.zip
git-e08387d32146337e97a9112ed3348f2e3bc3f9f5.tar.gz
git-e08387d32146337e97a9112ed3348f2e3bc3f9f5.tar.bz2
Merge branch 'eb/mboxrd-doc'
Doc update. * eb/mboxrd-doc: Documentation: explain "mboxrd" pretty format
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-formats.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index a4b6f49..547a552 100644
--- 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