diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:34:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-01 22:34:19 -0700 |
| commit | 3c91bf6805249d0f59ddff4e5dc4118127527243 (patch) | |
| tree | 8f07aa193c5206f736c1dbe2e3ac688938704636 /color.h | |
| parent | Merge branch 'kb/tracking-count-no-merges' (diff) | |
| parent | pack-objects: don't loosen objects available in alternate or kept packs (diff) | |
| download | tgif-3c91bf6805249d0f59ddff4e5dc4118127527243.tar.xz | |
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack:
pack-objects: don't loosen objects available in alternate or kept packs
t7700: demonstrate repack flaw which may loosen objects unnecessarily
Remove --kept-pack-only option and associated infrastructure
pack-objects: only repack or loosen objects residing in "local" packs
git-repack.sh: don't use --kept-pack-only option to pack-objects
t7700-repack: add two new tests demonstrating repacking flaws
Conflicts:
t/t7700-repack.sh
Diffstat (limited to 'color.h')
0 files changed, 0 insertions, 0 deletions