]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c5e7630 c641ca6)
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:34 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:34 +0000 (11:06 +0900)
commitf70a50fc48e4f3e00120153c68df1acd2a5aa382
treecbcc26717ba17dadd6e492e5245d5406cc6f6a43tree | snapshot
parentc5e763083fa675629c7d936d72fb67d8f03e0846commit | diff
parentc641ca67072946f95f87e7b21f13f3d4e73701e3commit | diff
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'

The three-way merge performed by "git cherry-pick" was confused
when a new submodule was added in the meantime, which has been
fixed (or "papered over").

* sb/test-cherry-pick-submodule-getting-in-a-way:
  merge-recursive: handle addition of submodule on our side of history
  t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.