summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <casey@nrlssc.navy.mil>2008-11-12 11:59:05 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 10:28:12 -0800
commitdd718365cccfddd7d5992a40296de50e7cabdfc8 (patch)
treedabec4bec194116aa37509b81351ac6deec52c35 /merge-tree.c
parentpack-objects: new option --honor-pack-keep (diff)
downloadtgif-dd718365cccfddd7d5992a40296de50e7cabdfc8.tar.xz
repack: don't repack local objects in packs with .keep file
If the user created a .keep file for a local pack, then it can be inferred that the user does not want those objects repacked. This fixes the repack bug tested by t7700. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions