summaryrefslogtreecommitdiff
path: root/builtin-fetch-pack.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-10 22:17:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-10 22:17:01 -0700
commit14468ab45bae83ad300f17f41fe8fd555329ee5e (patch)
tree0f6bcb7b16ac48757a3add8054f38ebe50819b0d /builtin-fetch-pack.c
parentMerge branch 'zf/maint-gitweb-acname' (diff)
parentmerge-recursive: don't segfault while handling rename clashes (diff)
downloadtgif-14468ab45bae83ad300f17f41fe8fd555329ee5e.tar.xz
Merge branch 'jc/maint-merge-recursive-fix'
* jc/maint-merge-recursive-fix: merge-recursive: don't segfault while handling rename clashes
Diffstat (limited to 'builtin-fetch-pack.c')
0 files changed, 0 insertions, 0 deletions