Merge branch 'jk/maint-diffstat-overflow' into maint

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index bff94991b68aaca5a81eae4e6681f3431aa6b9ac..aa96caeab26ee6132adbef03d2ca17e91f634208 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -28,3 +28,11 @@ people using 80-column terminals.
        command to re-code the commit log message in the encoding
        preferred by the user.  For non plumbing commands this
        defaults to UTF-8.
+
+--no-notes::
+--show-notes::
+       Show the notes (see linkgit:git-notes[1]) that annotate the
+       commit, when showing the commit log message.  This is the default
+       for `git log`, `git show` and `git whatchanged` commands when
+       there is no `--pretty`, `--format` nor `--oneline` option is
+       given on the command line.