diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-09-14 07:38:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-09-14 07:38:22 +0000 |
| commit | fd73d89626d7af23c1e2a51cdaca976c2bf89f23 (patch) | |
| tree | 2bda2c61f342f33d93351b50dc671a03c7966d5b /git-apply.html | |
| parent | 19ed368b17abfb9ad5c7467ea74fd8a045d96b43 (diff) | |
| download | git-htmldocs-fd73d89626d7af23c1e2a51cdaca976c2bf89f23.tar.gz | |
Autogenerated HTML docs for v1.4.2.1-g3852
Diffstat (limited to 'git-apply.html')
| -rw-r--r-- | git-apply.html | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/git-apply.html b/git-apply.html index 733a07544..84af247e5 100644 --- a/git-apply.html +++ b/git-apply.html @@ -454,15 +454,10 @@ and a work tree.</p> </dt>
<dd>
<p>
- When applying a patch, which is a git-enhanced patch
- that was prepared to record the pre- and post-image object
- name in full, and the path being patched exactly matches
- the object the patch applies to (i.e. "index" line's
- pre-image object name is what is in the working tree),
- and the post-image object is available in the object
- database, use the post-image object as the patch
- result. This allows binary files to be patched in a
- very limited way.
+ Historically we did not allow binary patch applied
+ without an explicit permission from the user, and this
+ flag was the way to do so. Currently we always allow binary
+ patch application, so this is a no-op.
</p>
</dd>
<dt>
@@ -573,7 +568,7 @@ apply.whitespace </div>
<div id="footer">
<div id="footer-text">
-Last updated 28-Aug-2006 07:18:32 UTC
+Last updated 14-Sep-2006 07:38:11 UTC
</div>
</div>
</body>
|