diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-15 01:37:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-17 00:20:40 (GMT) |
| commit | 011f4274bbb14e44035586f2ede695d584b8cfd2 (patch) | |
| tree | 539f12ed014b1d0beaab44280436eb8d5ba7102f /t/t4002-diff-basic.sh | |
| parent | 0c15cc921a54a2cd5f0758041fe9fdd715a493e8 (diff) | |
| download | git-011f4274bbb14e44035586f2ede695d584b8cfd2.zip git-011f4274bbb14e44035586f2ede695d584b8cfd2.tar.gz git-011f4274bbb14e44035586f2ede695d584b8cfd2.tar.bz2 | |
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 't/t4002-diff-basic.sh')
0 files changed, 0 insertions, 0 deletions