author | Junio C Hamano <gitster@pobox.com> | |
Thu, 12 Feb 2009 02:47:30 +0000 (18:47 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 12 Feb 2009 02:47:30 +0000 (18:47 -0800) | ||
commit | 30aa4fb15fa408596dea59cdc9f00c94eeaa69f1 | |
tree | a52e476cf2c87ab65f06c567424a1859a7f52ee2 | tree | snapshot |
parent | 0ea29cce4d099d2fa6613ec66c080776cfe869d5 | commit | diff |
parent | e5887c1bda12b31ea7af0ce798bfdee308e1b176 | commit | diff |
Merge branch 'maint'
* maint:
Prepare for 1.6.1.4.
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
Conflicts:
RelNotes
* maint:
Prepare for 1.6.1.4.
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
Conflicts:
RelNotes
sha1_file.c | diff1 | | diff2 | | blob | history |