diff options
author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-11-12 11:59:04 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 10:28:10 -0800 |
commit | e96fb9b8f90f907d720ea6b71c92e30c2b071f4a (patch) | |
tree | 8dfb0c63ec17c87db1be7577ca1dc70ae2f42d6e /t/t7610-mergetool.sh | |
parent | packed_git: convert pack_local flag into a bitfield and add pack_keep (diff) | |
download | tgif-e96fb9b8f90f907d720ea6b71c92e30c2b071f4a.tar.xz |
pack-objects: new option --honor-pack-keep
This adds a new option to pack-objects which will cause it to ignore an
object which appears in a local pack which has a .keep file, even if it
was specified for packing.
This option will be used by the porcelain repack.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions