summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:28:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-22 12:28:04 -0800
commitaa9066fccd4a4320ab3e90f566527b7497d2c7c0 (patch)
tree8d07bec90911a26b809038e1f5994cb7c5ce70e8 /contrib/examples/git-merge.sh
parentMerge branch 'jk/always-allow-large-packets' (diff)
parentread_packed_refs: use skip_prefix instead of static array (diff)
downloadtgif-aa9066fccd4a4320ab3e90f566527b7497d2c7c0.tar.xz
Merge branch 'jk/read-packed-refs-without-path-max'
Git did not correctly read an overlong refname from a packed refs file. * jk/read-packed-refs-without-path-max: read_packed_refs: use skip_prefix instead of static array read_packed_refs: pass strbuf to parse_ref_line read_packed_refs: use a strbuf for reading lines
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions