On 12/11/11 13:24, J.V. wrote: > OK so "work tree" is a new term for me. I thought we were in isolated > sandboxes called "branches" and changes made in a branch would stay in > that branch regardless. > > so anything in the "work tree" is over layed on top of my branch if > there are no conflicts? Kind of. I'd say that your work tree is updated to match a branch when you run git checkout initially. The branch is updated when you run git commit (after staging changes in the index with git add or using -a). -- 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