summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-12-10 14:35:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-10 14:35:12 -0800
commit8bb6fe853f6910526ed761938343cca79648a0b4 (patch)
tree7a9099eba3494b2c1187f493f13bdbd881182831 /Documentation/git-merge-file.txt
parentMerge branch 'jk/fetch-pack-avoid-sigpipe-to-index-pack' (diff)
parentrefs: work around gcc-11 warning with REF_HAVE_NEW (diff)
downloadtgif-8bb6fe853f6910526ed761938343cca79648a0b4.tar.xz
Merge branch 'jk/refs-g11-workaround'
Workaround for a false-alarm by gcc-11 * jk/refs-g11-workaround: refs: work around gcc-11 warning with REF_HAVE_NEW
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions