]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93c9949 6914155)
Merge branch 'en/merge-recursive-directory-rename-fixes' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:56:44 +0000 (13:56 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:56:44 +0000 (13:56 +0900)
commitebfdc3ff7b20064fc7fab04f761f5095ba5c3a05
treeab9a09044c46f7ccd7bf902087f83ee13b269b81tree | snapshot
parent93c9949b6a31deba4af5187bf802a751869b687acommit | diff
parent691415598f3a6112ff6c73292ab61ae9477b7ca1commit | diff
Merge branch 'en/merge-recursive-directory-rename-fixes' into next

A few glitches in the heuristic in merge-recursive to infer file
movements based on movements of other files in the same directory
have been corrected.

* en/merge-recursive-directory-rename-fixes:
  merge-recursive: fix merging a subdirectory into the root directory
  merge-recursive: clean up get_renamed_dir_portion()
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.