diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-14 17:37:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-16 16:20:40 -0800 |
| commit | 011f4274bbb14e44035586f2ede695d584b8cfd2 (patch) | |
| tree | 539f12ed014b1d0beaab44280436eb8d5ba7102f /Documentation/git-apply.txt | |
| parent | 0c15cc921a54a2cd5f0758041fe9fdd715a493e8 (diff) | |
| download | git-011f4274bbb14e44035586f2ede695d584b8cfd2.tar.gz git-011f4274bbb14e44035586f2ede695d584b8cfd2.tar.xz | |
apply: allow-binary-replacement.
A new option, --allow-binary-replacement, is introduced.
When you feed a diff that records full SHA1 name of pre- and
post-image blob on its index line to git-apply with this option,
the post-image blob replaces the path if what you have in the
working tree matches the pre-image _and_ post-image blob is
already available in the object directory.
Later we _might_ want to enhance the diff output to also include
the full binary data of the post-image, to make this more
useful, but this is good enough for local rebasing application.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 13 |
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> |