Merge branch 'gp/maint-cvsserver' into maint

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 140120092083558b418decca69088b336d134153..aa96caeab26ee6132adbef03d2ca17e91f634208 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -34,5 +34,5 @@ people using 80-column terminals.
        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` nor `--format` option is given on the
-       command line.
+       there is no `--pretty`, `--format` nor `--oneline` option is
+       given on the command line.