提交 f58bb6fb 编写于 作者: J Jonas Fonseca 提交者: Junio C Hamano

git-apply(1): document --unidiff-zero

Signed-off-by: NJonas Fonseca <fonseca@diku.dk>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 645927ce
...@@ -95,6 +95,16 @@ OPTIONS ...@@ -95,6 +95,16 @@ OPTIONS
context exist they all must match. By default no context is context exist they all must match. By default no context is
ever ignored. 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:: --apply::
If you use any of the options marked "Turns off If you use any of the options marked "Turns off
'apply'" above, gitlink:git-apply[1] reads and outputs the 'apply'" above, gitlink:git-apply[1] reads and outputs the
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册