diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:13 +0900 |
| commit | d9800351d3386db0c306fde03976d8475d7409a6 (patch) | |
| tree | e2a4b6bff5bc15b9acce073477ab86cc62f50c96 /unix-socket.h | |
| parent | Merge branch 'js/rebase-deprecate-preserve-merges' (diff) | |
| parent | t604[236]: do not run setup in separate tests (diff) | |
| download | git-d9800351d3386db0c306fde03976d8475d7409a6.tar.gz git-d9800351d3386db0c306fde03976d8475d7409a6.zip | |
Merge branch 'en/merge-recursive-directory-rename-fixes'
When all files from some subdirectory were renamed to the root
directory, the directory rename heuristics would fail to detect that
as a rename/merge of the subdirectory to the root directory, which has
been corrected.
* en/merge-recursive-directory-rename-fixes:
t604[236]: do not run setup in separate tests
merge-recursive: fix merging a subdirectory into the root directory
merge-recursive: clean up get_renamed_dir_portion()
Diffstat (limited to 'unix-socket.h')
0 files changed, 0 insertions, 0 deletions