Merge branch 'nd/misc-cleanups' into maint

[git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 5c53bdba948ea817e01e169a9fc183d4fc2d1313..9f7cba2be6a97cb85072d22b3317d37d1afe80bf 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -408,7 +408,12 @@ 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.
 
        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-format-patch[]

+ifndef::git-log[]

 --exit-code::
        Make the program exit with codes similar to diff(1).
        That is, it exits with 1 if there were differences and
 --exit-code::
        Make the program exit with codes similar to diff(1).
        That is, it exits with 1 if there were differences and


@@ -416,6 +421,7 @@ ifndef::git-format-patch[]
 
 --quiet::
        Disable all output of the program. Implies `--exit-code`.
 
 --quiet::
        Disable all output of the program. Implies `--exit-code`.

+endif::git-log[]

 endif::git-format-patch[]
 
 --ext-diff::
 endif::git-format-patch[]
 
 --ext-diff::