On Mon, 15 May 2006, Junio C Hamano wrote: > > read-tree -u one-way merge fix to check out locally modified paths. > > The "-u" flag means "update the working tree files", but to > other types of merges, it also implies "I want to keep my local > changes" -- because they prevent local changes from getting lost > by using verify_uptodate. The one-way merge is different from > other merges in that its purpose is opposite of doing something > else while keeping unrelated local changes. The point of > one-way merge is to nuke local changes. So while it feels > somewhat wrong that this actively loses local changes, it is the > right thing to do. Ack. On the other hand, I wonder if it might not make sense to have this part potentially depend on the "--reset" flag. That way you wouldn't even have to apologize for it. Linus - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html