git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit73b9c6f58358c2d6167f7a51ac06eee2fab6f5d8
tree2361d8691ae04f6d9af4b3a71dbec663e36fb488tree | snapshot
parenteea5e03a5a4636a95d18947643252ed52bb298cecommit | diff
parent2fa233a5541d643d1adae43bcac62226cb20d92dcommit | diff
Merge branch 'jk/delta-islands-with-bitmap-reuse-delta-fix'

Fix interactions between two recent topics.

* jk/delta-islands-with-bitmap-reuse-delta-fix:
  pack-objects: handle island check for "external" delta base
builtin/pack-objects.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT