diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-13 12:39:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-13 12:39:02 -0700 |
| commit | ae44b235d49db30324819f4775897d9a74ee1aad (patch) | |
| tree | 8e425da11b0f6e5e47837ae1906327558d1e93fe /Documentation | |
| parent | f6e8dd3b438992d22a6a2173f8980eae9dabaf37 (diff) | |
| parent | 82793c55e45ea1c7306ff396d8ce316241e584da (diff) | |
| download | git-ae44b235d49db30324819f4775897d9a74ee1aad.tar.gz git-ae44b235d49db30324819f4775897d9a74ee1aad.tar.xz | |
Merge branch 'jc/binary'
* jc/binary:
diff --binary generates full index on binary files.
Make apply --binary a no-op.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index c76cfffdc..0a6f7b321 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/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 |