summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-08-30 16:06:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-30 16:06:04 -0700
commit7e3b9d15344fa5a09fe5c70270c9f2c2f75d0f90 (patch)
treeccd77cab4aa38b32c5b6caddbc4850dd5aac014c /builtin/rerere.c
parentMerge branch 'jc/userdiff-pattern-hint' (diff)
parentapply: keep buffer/size pair in sync when parsing binary hunks (diff)
downloadtgif-7e3b9d15344fa5a09fe5c70270c9f2c2f75d0f90.tar.xz
Merge branch 'jk/apply-binary-hunk-parsing-fix'
"git apply" miscounted the bytes and failed to read to the end of binary hunks. * jk/apply-binary-hunk-parsing-fix: apply: keep buffer/size pair in sync when parsing binary hunks
Diffstat (limited to 'builtin/rerere.c')
0 files changed, 0 insertions, 0 deletions