git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eea5e03 2fa233a)
Merge branch 'jk/delta-islands-with-bitmap-reuse-delta-fix'
authorJunio C Hamano <redacted>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
committerJunio C Hamano <redacted>
Tue, 16 Oct 2018 07:16:00 +0000 (16:16 +0900)
Fix interactions between two recent topics.

* jk/delta-islands-with-bitmap-reuse-delta-fix:
  pack-objects: handle island check for "external" delta base

1  2 
builtin/pack-objects.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pack-objects.c
Simple merge
git clone https://git.99rst.org/PROJECT