]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b304ab 95983da)
Merge branch 'en/merge-rename-rename-worktree-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2020 15:33:27 +0000 (08:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2020 15:33:27 +0000 (08:33 -0700)
commitabbd1d9ebf9033924153c7a0f0abb37e7c8e50fd
treecaea3081d1e04556c08f69522d15f2b478a12be1tree | snapshot
parent7b304ab16c7b1e6cdf6294fe16177a42a2894f8ccommit | diff
parent95983da6b461a4394117d4f9fcca211d7fc1403fcommit | diff
Merge branch 'en/merge-rename-rename-worktree-fix'

When a binary file gets modified and renamed on both sides of history
to different locations, both files would be written to the working
tree but both would have the contents from "ours".  This has been
corrected so that the path from each side gets their original content.

* en/merge-rename-rename-worktree-fix:
  merge-recursive: fix rename/rename(1to2) for working tree with a binary
Unnamed repository; edit this file 'description' to name the repository.