X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=08b581f040859d39aeaad8294bc7a3e7760ab0b9;hb=9b55aa03daebf43067021b7d58abea249229987b;hp=b620b3afeca14166840fb76b4cefe1e4038fb47e;hpb=2c4610393195cc6f35ea79efadbc5c7fd7470891;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b620b3afe..08b581f04 100644
--- 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[]
 
+--minimal::
+	Spend extra time to make sure the smallest possible
+	diff is produced.
+
 --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.
 
+-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).