X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=626e281596c57d38b6df7bbf311494ee9c74da7f;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=6702a18c7e798018fc33c67001724c8e7d3a90ce;hpb=f7a2eb735982e921ae4379f1dcf5f7a023610393;p=git.git diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 6702a18c..626e2815 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] [...] +'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [...] 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