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.txt | |
| parent | 19ed368b17abfb9ad5c7467ea74fd8a045d96b43 (diff) | |
| download | git-htmldocs-fd73d89626d7af23c1e2a51cdaca976c2bf89f23.tar.gz | |
Autogenerated HTML docs for v1.4.2.1-g3852
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/git-apply.txt b/git-apply.txt index c76cfffdc..0a6f7b321 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -110,15 +110,10 @@ OPTIONS deletion part but not addition part. --allow-binary-replacement, --binary:: - 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. --exclude=<path-pattern>:: Don't apply changes to files matching the given path pattern. This can |