On Thu, Nov 06, 2008 at 06:17:54PM +0100, Steve Walker wrote: > Sorry to keep answering my own questions directly after posting... > > I just tried with a 'git commit -f' and the files updated. There is no "-f" option to commit. Did you mean "checkout -f"? If that is the case, then yes, that will "fix" your problem in that it brings the HEAD, index, and working tree into sync. But it is dangerous in that it throws away any local changes you might have had. If you did really mean "commit" then that is also a bad solution. It creates a new commit on top of the recently pushed work that reverts all of the changes made by the recently pushed work. -Peff -- 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