aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-16 21:32:44 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-16 21:32:44 -0800
commit27dedf0c3b78d1072fb5449149421284f9e5297b (patch)
tree80da2302f50bb1f396611a4a54a6da52a4592bd0 /Documentation/git-apply.txt
parent60d64db4614b1007ca37c228923ec1964d5ad394 (diff)
downloadgit-27dedf0c3b78d1072fb5449149421284f9e5297b.tar.gz
git-27dedf0c3b78d1072fb5449149421284f9e5297b.tar.xz
GIT 0.99.9j aka 1.0rc3v1.0rc3v0.99.9j
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 6702a18c7..626e28159 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -8,7 +8,7 @@ git-apply - Apply patch on a git index file and a work tree
SYNOPSIS
--------
-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [-z] [<patch>...]
+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>...]
DESCRIPTION
-----------
@@ -79,6 +79,17 @@ OPTIONS
the result with this option, which would apply the
deletion part but not addition part.
+--allow-binary-replacement::
+ 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.
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>