summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2008-01-20 23:37:01 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-01-21 01:04:12 -0800
commit7422bac441d6e00cfb8302600ae64512837ab4e3 (patch)
tree3c8c27b2558e2aa4a610d060c251910145547aff /builtin-merge-ours.c
parentTeach fast-import to honor pack.compression and pack.depth (diff)
downloadtgif-7422bac441d6e00cfb8302600ae64512837ab4e3.tar.xz
Document the hairy gfi_unpack_entry part of fast-import
Junio pointed out this part of fast-import wasn't very clear on initial read, and it took some time for someone who was new to fast-import's "dirty little tricks" to understand how this was even working. So a little bit of commentary in the proper place may help future readers. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions