Yaroslav Halchenko <debian@xxxxxxxxxxxxxx> writes: > git checkout dfsg > git merge --no-commit -s theirs 0.2 > # after all I do not, and must not have my modifications > git rm -rf non-free-1 ... # probably would be scripted > git commit The other day I was talking with Shawn Pearce and said that "-s theirs" would make sense only if used with --no-commit. But for such a use case, "git read-tree -m -u 0.2" would work just as well, and discussion ended there ;-) -- 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