Merge branch 'sb/blame-color'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index c01477ab5ef78a9491b709d60d64998b8848d35d..dba7f0c18e33e7e26ca100992236e39b3d5b8a91 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git' [--version] [--help] [-C <path>] [-c <name>=<value>]
     [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
-    [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
+    [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
     [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
     [--super-prefix=<path>]
     <command> [<args>]
@@ -103,6 +103,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
        configuration options (see the "Configuration Mechanism" section
        below).
 
+-P::
 --no-pager::
        Do not pipe Git output into a pager.
 
@@ -168,7 +169,10 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
        option and may change or be removed in the future. Supported
        groups are: builtins, parseopt (builtin commands that use
        parse-options), main (all commands in libexec directory),
-       others (all other commands in `$PATH` that have git- prefix).
+       others (all other commands in `$PATH` that have git- prefix),
+       list-<category> (see categories in command-list.txt),
+       nohelpers (exclude helper commands), alias and config
+       (retrieve command list from config variable completion.commands)
 
 GIT COMMANDS
 ------------