summaryrefslogtreecommitdiff
path: root/Documentation/git-repack.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-11-14 17:37:05 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-16 16:20:40 -0800
commit011f4274bbb14e44035586f2ede695d584b8cfd2 (patch)
tree539f12ed014b1d0beaab44280436eb8d5ba7102f /Documentation/git-repack.txt
parentgit-am: --resolved. (diff)
downloadtgif-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-repack.txt')
0 files changed, 0 insertions, 0 deletions