>>>>> "Junio" == Junio C Hamano <junkio@xxxxxxx> writes: Junio> Since I know I was just trying things out, I do not care what is Junio> in my index nor in the working tree files, so I could at this Junio> point say: Junio> $ git reset --hard Junio> to sync the master tree, but in general you may be running Junio> cvsimport into a dirty tree, in which case you are screwed. Yeah, this doesn't make sense. It used to "Just Work". I can certainly add "git reset --hard" to my workflow, if that's the real work around. And if so, the manpage should document that. Junio> ... Ugh, and after I wrote all of the above, the version of git Junio> I have at work predates that commit X-<. So maybe this was Junio> fixed with that commit, and you are expected to say: Junio> $ git pull . origin Junio> assuming that you are on "master" branch and cvsimoprt tracks Junio> CVS head with "origin" branch, that is. Again, if that's the case, the manpage should say what's really happening, so as not to confuse dumb people like me. :) -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 <merlyn@xxxxxxxxxxxxxx> <URL:http://www.stonehenge.com/merlyn/> Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! - : 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