summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:18:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:18:48 -0700
commit0dc691a4f3dcb67dd948eb97efcf7098059988c1 (patch)
tree51cc64356b359feb49d19228cd6b1e7cdc0542ae /ll-merge.c
parentMerge branch 'di/fast-import-blob-tweak' (diff)
parentfast-import: allow to tag newly created objects (diff)
downloadtgif-0dc691a4f3dcb67dd948eb97efcf7098059988c1.tar.xz
Merge branch 'di/fast-import-tagging'
* di/fast-import-tagging: fast-import: allow to tag newly created objects fast-import: add tests for tagging blobs
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions