Am 12/13/2010 22:46, schrieb Yaroslav Halchenko: > On Mon, 13 Dec 2010, Junio C Hamano wrote: >> But for such a use case, "git read-tree -m -u 0.2" would work just as >> well, and discussion ended there ;-) > > hm -- read-tree sounded like yet another unknown to me feature of GIT I > was trying desperately to discover ;) unfortunately it doesn't produce a merge > for me :-/ -- just a simple commit with the state taken from the other tree: How about: git merge --no-commit -s ours 0.2 git read-tree -m -u 0.2 git commit -m "Reset to 0.2" -- Hannes -- To unsubscribe from this list: 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