Merge branch 'rs/diff-whole-function'

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

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b620b3afeca14166840fb76b4cefe1e4038fb47e..08b581f040859d39aeaad8294bc7a3e7760ab0b9 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -45,6 +45,10 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 

+--minimal::
+       Spend extra time to make sure the smallest possible
+       diff is produced.
+

 --patience::
        Generate a diff using the "patience diff" algorithm.
 
 --patience::
        Generate a diff using the "patience diff" algorithm.
 


@@ -404,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.
 
        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).
 ifndef::git-format-patch[]
 --exit-code::
        Make the program exit with codes similar to diff(1).