[Scummvm-devel] force-push

Willem Jan Palenstijn wjp at usecode.org
Sun Jan 29 16:59:34 CET 2012


On Sun, Jan 29, 2012 at 03:37:15PM +0000, Willem Jan Palenstijn wrote:
> Hi all,
> 
> I just did a force-push on master to get rid of a large number of seemingly
> accidentally pushed commits followed by a large revert.
> 
> The bad range was 0ceeee8148..5407bb8fcd.
> 
> LordHoto had already done a number of commits after that, up to 194c0491394,
> which I rebased.
> 
> Unfortunately this total range covered quite a bit of time (8 hours), so there
> may be some people who have the now-removed commits checked out. Please take
> care when pulling not to accidentally merge the removed commits back into
> master.
> 
> If that happens, and you had no local changes, you can do a
> 'git rebase --hard remotes/origin/master' to reset your local master back to
> the repository's master.

P.P.S. As DrMcCoy points out, this should be
'git reset --hard remotes/origin/master'.

-Willem Jan




More information about the Scummvm-devel mailing list