git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7bb1fcc)
merge-recursive: do not clobber untracked working tree garbage
authorJunio C Hamano <redacted>
Mon, 15 Dec 2008 03:40:09 +0000 (19:40 -0800)
committerJunio C Hamano <redacted>
Mon, 15 Dec 2008 10:39:57 +0000 (02:39 -0800)
commitc5ab03f26c992e30f355fba129f70db0f290fcd7
tree799ffb275675e682cc9b4375eddd7c0e70139187tree | snapshot
parent7bb1fcc6fcc5a2d0164f243fd10f346eb0822ddfcommit | diff
merge-recursive: do not clobber untracked working tree garbage

When merge-recursive wanted to create a new file in the work tree (either
as the final result, or a hint for reference purposes while delete/modify
conflicts), it unconditionally overwrote an untracked file in the working
tree.  Be careful not to lose whatever the user has that is not tracked.

Signed-off-by: Junio C Hamano <redacted>
builtin-merge-recursive.c diff | blob | history
t/t7607-merge-overwrite.sh diff | blob | history
git clone https://git.99rst.org/PROJECT