Merge branch 'sb/submodule-merge-in-merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:27 +0000 (21:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:27 +0000 (21:51 +0900)
commit0821b73...63a6d4cfd2f61619b7afe01ce9c6d99e
tree9134195...57e8bd6ad1b6b404aba4e6d891446fa7copy hash to clipboard (tree)
parent2305770...160db47fe96e6a0b2a547b3f30813e7ecopy hash to clipboard (diff)
parent76f4212...9718f5f504558e97dfb99e16c9ceb7c6copy hash to clipboard (diff)
merge-recursive.c
submodule.c
submodule.h