| commit | 011f4274bbb14e44035586f2ede695d584b8cfd2 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 15 Nov 2005 01:37:05 +0000 (14 17:37 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 17 Nov 2005 00:20:40 +0000 (16 16:20 -0800) | ||
| tree | 539f12ed014b1d0beaab44280436eb8d5ba7102f | treesnapshot (tar.gz zip) |
| parent | 0c15cc921a54a2cd5f0758041fe9fdd715a493e8 | commitdiff |
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>
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>
| Documentation/git-apply.txt | diffblobblamehistory | |
| apply.c | diffblobblamehistory | |
| t/t4103-apply-binary.sh | diffblobblamehistory |