Code

Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2009 02:32:37 +0000 (18:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2009 02:32:37 +0000 (18:32 -0800)
* maint-1.6.0:
  Make repack less likely to corrupt repository
  fast-export: ensure we traverse commits in topological order
  Clear the delta base cache if a pack is rebuilt

1  2 
builtin-fast-export.c
sha1_file.c

Simple merge
diff --cc sha1_file.c
Simple merge