Merge branch 'jc/maint-1.6.0-keep-pack'

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 159390c35a9413590b83f512c3f9f59e6a275e77..5c6e678aa3d9e75570d5a5578e38b0a45bae720e 100644 (file)
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -152,3 +152,12 @@ $ git log -2 --pretty=tformat:%h 4da45bef \
 4da45be
 7134973
 ---------------------
++
+In addition, any unrecognized string that has a `%` in it is interpreted
+as if it has `tformat:` in front of it.  For example, these two are
+equivalent:
++
+---------------------
+$ git log -2 --pretty=tformat:%h 4da45bef
+$ git log -2 --pretty=%h 4da45bef
+---------------------