aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-06 22:45:21 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-07 02:44:40 -0700
commit2b6eef943ff81df63a809857b7b400ee175eb29b (patch)
tree8fab428249716f64abbe1a2286f6ab2b3ee3beb1 /Documentation
parent7bbf88c52b202d543310123e1bad9a44b2d6f028 (diff)
downloadgit-2b6eef943ff81df63a809857b7b400ee175eb29b.tar.gz
git-2b6eef943ff81df63a809857b7b400ee175eb29b.tar.xz
Make apply --binary a no-op.
Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. This makes the flag a no-op by always allowing binary patch application. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-apply.txt13
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