git-apply(1): document --unidiff-zero
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca committed
Sep 17, 2006 at 12:55 UTC
f58bb6fb41a24723ef59febe344f36956a9a8d41
1 file changed
+10
Documentation/git-apply.txt
+10
@@ -95,6 +95,16 @@ OPTIONS
95
context exist they all must match. By default no context is
96
ever ignored.
97
98
+--unidiff-zero::
99
+ By default, gitlink:git-apply[1] expects that the patch being
100
+ applied is a unified diff with at least one line of context.
101
+ This provides good safety measures, but breaks down when
102
+ applying a diff generated with --unified=0. To bypass these
103
+ checks use '--unidiff-zero'.
104
++
105
+Note, for the reasons stated above usage of context-free patches are
106
+discouraged.
107
+
108
--apply::
109
If you use any of the options marked "Turns off
110
'apply'" above, gitlink:git-apply[1] reads and outputs the