X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=228ccaf10ab6bf7e4a3909d31ac31afbd2361d8c;hb=451e593181c554b06f1ce292b4233d396a355753;hp=0f07c9c4a86df8ac2d7ab2f99e31226e395b63ab;hpb=b941ffac506d3f57246e46a8913da614e62a1d48;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 0f07c9c4a..228ccaf10 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,6 +4,13 @@
 -u::
 	Synonym for "-p".
 
+-U<n>::
+	Shorthand for "--unified=<n>".
+
+--unified=<n>::
+	Generate diffs with <n> lines of context instead of
+	the usual three. Implies "-p".
+
 --raw::
 	Generate the raw format.
 
@@ -36,7 +43,9 @@
 	Synonym for "-p --stat".
 
 -z::
-	\0 line termination on output
+	NUL-line termination on output.  This affects the --raw
+	output field terminator.  Also output from commands such
+	as "git-log" will be delimited with NUL between commits.
 
 --name-only::
 	Show only names of changed files.
@@ -168,5 +177,13 @@
 --quiet::
 	Disable all output of the program. Implies --exit-code.
 
+--ext-diff::
+	Allow an external diff helper to be executed. If you set an
+	external diff driver with gitlink:gitattributes(5), you need
+	to use this option with gitlink:git-log(1) and friends.
+
+--no-ext-diff::
+	Disallow external diff drivers.
+
 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].