merge-recursive: handle addition of submodule on our side of history
authorElijah Newren <newren@gmail.com>
Tue, 14 Nov 2017 17:31:24 +0000 (09:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:42:34 +0000 (12:42 +0900)
commitc641ca6...072946f95f87e7b21f13f3d4e73701e3
treef8005b7...d1dd6cb8e7359a08ae83bfca83c8654ccopy hash to clipboard (tree)
parent89c4ee4...74269635e69c84800ece0f8b754636f6copy hash to clipboard (diff)
merge-recursive.c
t/t3512-cherry-pick-submodule.sh