diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-02 23:00:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-02 23:00:04 -0800 |
| commit | 0fd9d7e66deb7071da2a568b96c94f94ee890908 (patch) | |
| tree | e8af2cdc7eee0aaa92087e7e798aa8d1c0d6acf1 /xdiff/xinclude.h | |
| parent | Merge branch 'js/mingw-rename-fix' into maint (diff) | |
| parent | repack: only unpack-unreachable if we are deleting redundant packs (diff) | |
| download | tgif-0fd9d7e66deb7071da2a568b96c94f94ee890908.tar.xz | |
Merge branch 'bc/maint-keep-pack' into maint
* bc/maint-keep-pack:
repack: only unpack-unreachable if we are deleting redundant packs
t7700: test that 'repack -a' packs alternate packed objects
pack-objects: extend --local to mean ignore non-local loose objects too
sha1_file.c: split has_loose_object() into local and non-local counterparts
t7700: demonstrate mishandling of loose objects in an alternate ODB
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
repack: do not fall back to incremental repacking with [-a|-A]
repack: don't repack local objects in packs with .keep file
pack-objects: new option --honor-pack-keep
packed_git: convert pack_local flag into a bitfield and add pack_keep
t7700: demonstrate mishandling of objects in packs with a .keep file
Diffstat (limited to 'xdiff/xinclude.h')
0 files changed, 0 insertions, 0 deletions