Merge branch 'jn/request-pull'

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index fb184ba1863845797a5f296581ec74a1b31bef1a..57aa57467537d38f2e3ddcd86f701a0ed74bb42f 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -37,7 +37,8 @@ include::diff-options.txt[]
        and <until>, see "SPECIFYING REVISIONS" section in
        linkgit:git-rev-parse[1].
 
---decorate[=short|full]::
+--no-decorate::
+--decorate[=short|full|no]::
        Print out the ref names of any commits that are shown. If 'short' is
        specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
        'refs/remotes/' will not be printed. If 'full' is specified, the