git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c

projects / thirdparty / git.git / commit

author	Elijah Newren <newren@gmail.com>
	Thu, 19 Apr 2018 17:58:11 +0000 (10:58 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit	79c47598f5c8c0008ae9281f20c2a041d4cabd93
tree	889171881bb406243998cde584decd73fea00721	tree \| snapshot
parent	9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34	commit \| 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.

RSS Atom