summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 08:43:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-03 08:43:03 -0700
commitf1ad05f3a524a8750533d8263ceb584a9e7ec573 (patch)
tree9a7c452694f2718b34ddebf32aacf5a373203d5c /xdiff-interface.h
parentMerge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1 (diff)
parentpack-refs: add fully-peeled trait (diff)
downloadtgif-f1ad05f3a524a8750533d8263ceb584a9e7ec573.tar.xz
Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1
* jk/fully-peeled-packed-ref: pack-refs: add fully-peeled trait pack-refs: write peeled entry for non-tags use parse_object_or_die instead of die("bad object") avoid segfaults on parse_object failure
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions