Skip to content

Commit

Permalink
git-apply(1): document --unidiff-zero
Browse files Browse the repository at this point in the history
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Jonas Fonseca authored and Junio C Hamano committed Sep 17, 2006
1 parent 645927c commit f58bb6f
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Documentation/git-apply.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f58bb6f

Please sign in to comment.