summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-27 12:36:58 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-27 12:36:58 +0900
commit5afd72a96f0a3f65a832fd1448d9de1c534aaa69 (patch)
tree0bf876b7fb4058a93b6daf7d23e917515eaab637 /git-merge-octopus.sh
parentMerge branch 'mt/t2080-cp-symlink-fix' (diff)
parentpack-objects: move static inline from a header to the sole consumer (diff)
downloadtgif-5afd72a96f0a3f65a832fd1448d9de1c534aaa69.tar.xz
Merge branch 'ab/pack-linkage-fix'
"ld" on Solaris fails to link some test helpers, which has been worked around by reshuffling the inline function definitions from a header file to a source file that is the only user of them. * ab/pack-linkage-fix: pack-objects: move static inline from a header to the sole consumer
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions