Merge branch 'rs/no-no-no-parseopt'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 66624a17698ac91cfcd6d45d1af6024c4bf066d9..9f7cba2be6a97cb85072d22b3317d37d1afe80bf 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[]
 ifndef::git-log[]
 --exit-code::