]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a23e0b6 2b86c10)
Merge branch 'en/ort-dir-rename-and-symlink-fix'
authorTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:43 +0000 (21:04 -0400)
committerTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:43 +0000 (21:04 -0400)
commit969230b64fe76972d55b55cee8136e43a7e84752
tree880d47df834dc02f7707b021ae7b43132e3426fctree | snapshot
parenta23e0b69e2d25a893e187d86719de0b12b324579commit | diff
parent2b86c10084a54ee2b2e2cfd69ac02f3719fb47e0commit | diff
Merge branch 'en/ort-dir-rename-and-symlink-fix'

Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.

* en/ort-dir-rename-and-symlink-fix:
  merge-ort: fix bug with dir rename vs change dir to symlink
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.