diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-09-18 02:47:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-09-18 02:47:16 +0000 |
| commit | 3eb513f72a4d78c8b588c8ee957826c86c842a96 (patch) | |
| tree | ba6b210afb5d5eefe94fb66f2ade52b7cf773d11 /git-apply.txt | |
| parent | 781d8a233390886630e880b2bec86697bd9cb6fa (diff) | |
| download | git-htmldocs-3eb513f72a4d78c8b588c8ee957826c86c842a96.tar.gz | |
Autogenerated HTML docs for v1.4.2.1-g80823
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-apply.txt b/git-apply.txt index 0a6f7b321..d9137c748 100644 --- a/git-apply.txt +++ b/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 |