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.html | |
| parent | 781d8a233390886630e880b2bec86697bd9cb6fa (diff) | |
| download | git-htmldocs-3eb513f72a4d78c8b588c8ee957826c86c842a96.tar.gz | |
Autogenerated HTML docs for v1.4.2.1-g80823
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/git-apply.html b/git-apply.html index 84af247e5..1fe07027b 100644 --- a/git-apply.html +++ b/git-apply.html @@ -426,6 +426,20 @@ and a work tree.</p> </p>
</dd>
<dt>
+--unidiff-zero
+</dt>
+<dd>
+<p>
+ By default, <a href="git-apply.html">git-apply(1)</a> 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 <em>--unidiff-zero</em>.
+</p>
+<p>Note, for the reasons stated above usage of context-free patches are
+discouraged.</p>
+</dd>
+<dt>
--apply
</dt>
<dd>
@@ -568,7 +582,7 @@ apply.whitespace </div>
<div id="footer">
<div id="footer-text">
-Last updated 14-Sep-2006 07:38:11 UTC
+Last updated 18-Sep-2006 02:46:59 UTC
</div>
</div>
</body>
|