Merge branch 'jk/pack-bitmap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:00:32 +0000 (8 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 19:00:33 +0000 (8 12:00 -0700)
* jk/pack-bitmap:
  pack-objects: do not reuse packfiles without --delta-base-offset
  add `ignore_missing_links` mode to revwalk

1  2 
builtin/pack-objects.c
list-objects.c
revision.c
revision.h

Simple merge
diff --cc list-objects.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge