Merge branch 'jk/trailing-slash-in-pathspec'

diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 5e499421a43526e133c7bd3be134da803b35c00d..eea0e306a83834e75f44c1b932e5a7747195f85c 100644 (file)
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -28,7 +28,7 @@ people using 80-column terminals.
        This is a shorthand for "--pretty=oneline --abbrev-commit"
        used together.
 
---encoding[=<encoding>]::
+--encoding=<encoding>::
        The commit objects record the encoding used for the log message
        in their encoding header; this option can be used to tell the
        command to re-code the commit log message in the encoding