summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-28 20:18:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-28 20:18:04 (GMT)
commit7f554a4f694dc5e9a3cb42887546a121ff9d2b93 (patch)
tree37214dbf4da7779338af9a7156dae1eb31f99be2 /git-merge.sh
parentaaf113ed95f58d83a81ccdaf32e41a5d8f1d98cf (diff)
parent88617d11f9d2ee1ea726cef4527d676a9a46fa63 (diff)
downloadgit-7f554a4f694dc5e9a3cb42887546a121ff9d2b93.zip
git-7f554a4f694dc5e9a3cb42887546a121ff9d2b93.tar.gz
git-7f554a4f694dc5e9a3cb42887546a121ff9d2b93.tar.bz2
Merge branch 'tb/reverse-midx'
The code that gives an error message in "git multi-pack-index" when no subcommand is given tried to print a NULL pointer as a strong, which has been corrected. * tb/reverse-midx: multi-pack-index: fix potential segfault without sub-command
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions