X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=9f7cba2be6a97cb85072d22b3317d37d1afe80bf;hb=df6246ed78d040f06f095dd62d8db07a0aa19a96;hp=b620b3afeca14166840fb76b4cefe1e4038fb47e;hpb=689b047072030db30d101d43dbef6afd3b703c09;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b620b3afe..9f7cba2be 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,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.
 
+-W::
+--function-context::
+	Show whole surrounding functions of changes.
+
 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
@@ -412,6 +421,7 @@ ifndef::git-format-patch[]
 
 --quiet::
 	Disable all output of the program. Implies `--exit-code`.
+endif::git-log[]
 endif::git-format-patch[]
 
 --ext-diff::