From: sean <seanlkml@sympatico.ca>
Date: Thu, 16 Mar 2006 14:52:13 GMT
Subject: Re: git-reset and clones
Message-ID: <BAYC1-PASMTP09E59C4F23C4CDF45B1C42AEE70@CEZ.ICE>
In-Reply-To: <Pine.LNX.4.64.0603161424310.5276@sheen.jakma.org>

On Thu, 16 Mar 2006 14:34:42 +0000 (GMT)
Paul Jakma <paul@clubi.ie> wrote:

> If a git repository has a reset HEAD~X done, then any later pulls in 
> clone repositories get /really/ upset, with:
> 
> $ git pull
> * refs/heads/origin: does not fast forward to branch 'master' of 
> /home/paul/foo-git/;
> 
> Type of thing. This seems to be a similar issue to:
> 
>  	http://www.gelato.unsw.edu.au/archives/git/0510/10767.html
> 
> The question is has this improved at all since last year? Is there 
> anything the origin repository maintainer (the one who did reset) can 
> do to recover from this?

It's still not a recommended operation on a repository that is pulled 
by others.  If you realize you made a mistake by resetting the head, 
you can undo the operation afterward with:

$ git reset ORIG_HEAD

Sean