summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-04-14 14:17:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-04-14 14:17:12 -0700
commit4027e30c5395c9c1aeea85e99f51ac62f5148145 (patch)
treebe0afd51aa31e5a0e20beafb673c72f56a422108 /git-merge-one-file.sh
parentMerge branch 'jc/relnotes-updates' (diff)
parentRelNotes: revert the description on the reverted topics (diff)
downloadtgif-4027e30c5395c9c1aeea85e99f51ac62f5148145.tar.xz
Merge branch 'jc/revert-ref-transaction-hook-changes'
Revert the "deletion of a ref should not trigger transaction events for loose and packed ref backends separately" that regresses the behaviour when a ref is not modified since it was packed. * jc/revert-ref-transaction-hook-changes: RelNotes: revert the description on the reverted topics Revert "fetch: increase test coverage of fetches" Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions