Merge branch 'jk/xstrfmt'

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index eea0e306a83834e75f44c1b932e5a7747195f85c..8569e29d08784cb5eb053af919e4b7514b1c296b 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -39,7 +39,7 @@ 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`, `--format` nor `--oneline` option given
+       there is no `--pretty`, `--format`, or `--oneline` option given
        on the command line.
 +
 By default, the notes shown are from the notes refs listed in the