Merge branch 'pw/p4-update'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 5c53bdba948ea817e01e169a9fc183d4fc2d1313..08b581f040859d39aeaad8294bc7a3e7760ab0b9 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -408,6 +408,10 @@ endif::git-format-patch[]
        Show the context between diff hunks, up to the specified number
        of lines, thereby fusing hunks that are close to each other.
 
+-W::
+--function-context::
+       Show whole surrounding functions of changes.
+
 ifndef::git-format-patch[]
 --exit-code::
        Make the program exit with codes similar to diff(1).