Merge branch 'js/objc-funchdr'

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 746bc5b7f9a3f96ea321586e095a4fc8ccb6e73f..6d66c74cc11e6622892061f8328d04dfe38f87bf 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -1,9 +1,12 @@
 --pretty[='<format>']::
 
-       Pretty print the contents of the commit logs in a given format,
+       Pretty-print the contents of the commit logs in a given format,
        where '<format>' can be one of 'oneline', 'short', 'medium',
        'full', 'fuller', 'email', 'raw' and 'format:<string>'.
-       When left out the format default to 'medium'.
+       When omitted, the format defaults to 'medium'.
++
+Note: you can specify the default pretty format in the repository
+configuration (see linkgit:git-config[1]).
 
 --abbrev-commit::
        Instead of showing the full 40-byte hexadecimal commit object