aboutsummaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2006-09-22 21:25:04 -0400
committerJunio C Hamano <junkio@cox.net>2006-09-27 00:12:00 -0700
commit780e6e735be189097dad4b223d8edeb18cce1928 (patch)
tree834f1ae5995ed2590c2c8abf41a9652ee0567921 /merge-base.c
parentbe6b19145f64f62790049c06320c35011f7312a7 (diff)
downloadgit-780e6e735be189097dad4b223d8edeb18cce1928.tar.gz
git-780e6e735be189097dad4b223d8edeb18cce1928.tar.xz
make pack data reuse compatible with both delta types
This is the missing part to git-pack-objects allowing it to reuse delta data to/from any of the two delta types. It can reuse delta from any type, and it outputs base offsets when --allow-delta-base-offset is provided and the base is also included in the pack. Otherwise it outputs base sha1 references just like it always did. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions