git.99rst.org Git - git.git/commit

author	Elijah Newren <redacted>
	Wed, 14 Feb 2018 18:52:01 +0000 (10:52 -0800)
committer	Junio C Hamano <redacted>
	Tue, 27 Feb 2018 22:11:58 +0000 (14:11 -0800)
commit	7b3d3b06811c3d603d47d50eb3c8775571845a80
tree	fc58e4f6e20da1265d3656935fc3487e8ee70a0c	tree \| snapshot
parent	3b9616f149e46e1a97bf6dd5bc727a663d92dded	commit \| diff

merge-recursive: avoid clobbering untracked files with directory renames

Reviewed-by: Stefan Beller <redacted>
Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>

merge-recursive.c		diff \| blob \| history
t/t6043-merge-rename-directories.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT