summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 12:54:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-25 12:54:26 -0700
commit05e816e37f4eb023a3606b2942192390566c6107 (patch)
tree2f266768dd254fcc510f6a3966bb895e6ca6e798 /Documentation/merge-config.txt
parentMerge branch 'tg/fix-check-order-with-split-index' (diff)
parentrefs.c: drop curate_packed_refs (diff)
downloadtgif-05e816e37f4eb023a3606b2942192390566c6107.tar.xz
Merge branch 'jk/prune-with-corrupt-refs'
"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions