Merge branch 'maint-1.7.7' into maint-1.7.8
[git/git.git] / Documentation / diff-options.txt
index de2206b..ba7cd13 100644 (file)
@@ -411,6 +411,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::