summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:34 -0700
commit73da5a1e85951ee967edde956021c55adeaa83ce (patch)
treedebf3a3164c366440ea1c8905e71310ee45d0fe3 /diffcore-pickaxe.c
parentMerge branch 'jp/index-with-corrupt-stages' (diff)
parentfast-import: fix segfault in store_tree() (diff)
downloadtgif-73da5a1e85951ee967edde956021c55adeaa83ce.tar.xz
Merge branch 'mb/fast-import-delete-root'
An attempt to remove the entire tree in the "git fast-import" input stream caused it to misbehave. * mb/fast-import-delete-root: fast-import: fix segfault in store_tree() t9300: test filedelete command
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions