diff options
| author |  Linus Torvalds <torvalds@osdl.org> | 2006-05-14 10:43:50 -0700 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-05-14 16:48:23 -0700 |
| commit | 76b99b81613abea4cc16e45e1b11dbbec82a4b4d (patch) | |
| tree | 71e223857537c34fc72f8ddeb26470f0ae2640d3 /object.c | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-76b99b81613abea4cc16e45e1b11dbbec82a4b4d.tar.xz | |
Allow one-way tree merge to remove old files
For some random reason (probably just because nobody noticed), the one-way
merge strategy didn't mark deleted files as deleted, so if you used
git-read-tree -m -u <newtree>
it would update the files that got changed in the index, but it would not
delete the files that got deleted.
This should fix it, and I can't imagine that anybody depends on the old
strange "update only existing files" behaviour.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions