summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:53 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:53 +0900
commitdafbe1993e54bccb80501a98812105a7bcddc748 (patch)
tree24bcea3017eb518a6e5f81abd1cee2c7d4b0ab89 /git-merge-one-file.sh
parentMerge branch 'mh/notes-cleanup' (diff)
parentrefs/files-backend: add `refname`, not "HEAD", to list (diff)
downloadtgif-dafbe1993e54bccb80501a98812105a7bcddc748.tar.xz
Merge branch 'ma/split-symref-update-fix'
A leakfix. * ma/split-symref-update-fix: refs/files-backend: add `refname`, not "HEAD", to list refs/files-backend: correct return value in lock_ref_for_update refs/files-backend: fix memory leak in lock_ref_for_update refs/files-backend: add longer-scoped copy of string to list
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions