diff options
| author |  Brandon Casey <drafnel@gmail.com> | 2008-11-12 11:59:03 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-11-12 10:28:08 -0800 |
| commit | 8d25931d6ff47a7fb06512d767d1d416d9bc7733 (patch) | |
| tree | 81a5c69309c1eec4ad8bb723b20998b4a9aa4aa6 /Documentation/git-merge-file.txt | |
| parent | t7700: demonstrate mishandling of objects in packs with a .keep file (diff) | |
| download | tgif-8d25931d6ff47a7fb06512d767d1d416d9bc7733.tar.xz | |
packed_git: convert pack_local flag into a bitfield and add pack_keep
pack_keep will be set when a pack file has an associated .keep file.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions