aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2006-09-17 12:55:38 +0200
committerJunio C Hamano <junkio@cox.net>2006-09-17 15:08:29 -0700
commitf58bb6fb41a24723ef59febe344f36956a9a8d41 (patch)
tree8dc86f4e4f7ef11e60c01454611a3fc6cf925cc4
parent645927cec82253a3592ca738c4a405427a71eb31 (diff)
downloadgit-f58bb6fb41a24723ef59febe344f36956a9a8d41.tar.gz
git-f58bb6fb41a24723ef59febe344f36956a9a8d41.tar.xz
git-apply(1): document --unidiff-zero
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-apply.txt10
1 files changed, 10 insertions, 0 deletions
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