We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 4abed45 commit b44adbcCopy full SHA for b44adbc
git-submodule-resolve
@@ -30,6 +30,7 @@ submod_left_id=read_info(super_left, submodule)[:object_id][0..6]
30
submod_right_id=read_info(super_right, submodule)[:object_id][0..6]
31
32
Dir.chdir(submodule) do
33
+ system("git fetch")
34
merge_base = %x(git merge-base #{submod_left_id} #{submod_right_id}).chomp
35
merge_base_parent = %x{git show #{merge_base} --pretty=%P}.split("\n").first
36
0 commit comments