Merge branch 'ns/init-mkdir'

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index fccb82deb48ec75d25f948e7caa69a44e09f5832..b753c9d76fde51198eb7ef34b9ff298095fb1f72 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -122,6 +122,14 @@ OPTIONS
 -<num>::
        A shortcut for specifying -C<num>.
 
+-p::
+--show-function::
+       Show the preceding line that contains the function name of
+       the match, unless the matching line is a function name itself.
+       The name is determined in the same way as 'git diff' works out
+       patch hunk headers (see 'Defining a custom hunk-header' in
+       linkgit:gitattributes[5]).
+
 -f <file>::
        Read patterns from <file>, one per line.