Re: Rewrite history then pull repository?

From: Thomas Rast <trast@student.ethz.ch>
Date: Jul 13, 2009, 08:58 UTC
Message-ID: <200907131058.15118.trast@student.ethz.ch>
In-Reply-To: <h3es3p$ie6$1@ger.gmane.org>

Graeme Geldenhuys wrote:

Show 9 quoted lines

> 
> I pushed a repository to Github (a mirror of SubVersion repository). I 
> then had some screwup with 'git svn rebase' when I should have used 'git 
> svn fetch'.  Anyway I managed to fix the issue locally and then forced 
> the push to GitHub. This rewrote the history for the HEAD commit and 
> gave it a different date and SHA1.
> 
> What will now happen to developers that cloned the repository before the 
>   history rewrite and then do a 'git pull' after the history rewrite?

See the "Recovering From Upstream Rebase" section in man git-rebase, also available online at

  http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html

(especially useful if your local git is older than 1.6.1 and doesn't have this section yet).

-- 
Thomas Rast
trast@{inf,student}.ethz.ch