apply: allow-binary-replacement.
authorJunio C Hamano <junkio@cox.net>
Tue, 15 Nov 2005 01:37:05 +0000 (17:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 00:20:40 +0000 (16:20 -0800)
commit011f4274bbb14e44035586f2ede695d584b8cfd2
tree539f12ed014b1d0beaab44280436eb8d5ba7102f
parent0c15cc921a54a2cd5f0758041fe9fdd715a493e8
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>
Documentation/git-apply.txt
apply.c
t/t4103-apply-binary.sh