From: Jonas Fonseca Date: Sun, 17 Sep 2006 10:55:38 +0000 (+0200) Subject: git-apply(1): document --unidiff-zero X-Git-Tag: v1.4.3-rc1~87 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f58bb6fb41a24723ef59febe344f36956a9a8d41;p=git.git git-apply(1): document --unidiff-zero Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano --- 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