projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3b9616f) | patch
merge-recursive: avoid clobbering untracked files with directory renames
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:52:01 +0000 (10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commit7b3d3b06811c3d603d47d50eb3c8775571845a80
treefc58e4f6e20da1265d3656935fc3487e8ee70a0ctree | snapshot
parent3b9616f149e46e1a97bf6dd5bc727a663d92ddedcommit | diff
merge-recursive: avoid clobbering untracked files with directory renames

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
t/t6043-merge-rename-directories.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.