]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 480d3d6) | patch
unpack-trees: avoid nuking untracked dir in way of unmerged file
authorElijah Newren <newren@gmail.com>
Mon, 27 Sep 2021 16:33:45 +0000 (16:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Sep 2021 20:38:37 +0000 (13:38 -0700)
commit1fdd51aa13c27403c37b57ead32ef79b81d8128b
treeaa2959d443ab6329fb8f0901be3bd2f5848d7b83tree | snapshot
parent480d3d6bf90a6ec5b8f02d672f1d4027a4889106commit | diff
unpack-trees: avoid nuking untracked dir in way of unmerged file

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2500-untracked-overwriting.sh diff | blob | blame | history
unpack-trees.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.