author | Junio C Hamano <junkio@cox.net> | |
Thu, 2 Mar 2006 07:10:00 +0000 (23:10 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 2 Mar 2006 07:20:01 +0000 (23:20 -0800) | ||
commit | 1142038098810a69e57d88554559e4e6116df177 | |
tree | e8f0b311c8aa119c7e25616f7fea54fc7659880e | tree | snapshot |
parent | e1a0c8b1483b38d32d3870408e03a6c1b340aa15 | commit | diff |
read-tree --aggressive: remove deleted entry from the working tree.
When both heads deleted, or our side deleted while the other
side did not touch, we did not have to update the working tree.
However, we forgot to remove existing working tree file when we
did not touch and the other side did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When both heads deleted, or our side deleted while the other
side did not touch, we did not have to update the working tree.
However, we forgot to remove existing working tree file when we
did not touch and the other side did.
Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree.c | diff | blob | history |