X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=d9137c74898f839a8ee5e79daf1080b2ec882dfd;hb=8719f93b5619a0df99cec6e919a260f01ab76184;hp=0a6f7b32192df8a8a2266b0d302271a62c612b1f;hpb=4d69065d3adad480b79831ca9f08536aaf563dba;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 0a6f7b321..d9137c748 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -95,6 +95,16 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+--unidiff-zero::
+	By default, gitlink:git-apply[1] expects that the patch being
+	applied is a unified diff with at least one line of context.
+	This provides good safety measures, but breaks down when
+	applying a diff generated with --unified=0. To bypass these
+	checks use '--unidiff-zero'.
++
+Note, for the reasons stated above usage of context-free patches are
+discouraged.
+
 --apply::
 	If you use any of the options marked "Turns off
 	'apply'" above, gitlink:git-apply[1] reads and outputs the