Re: reverting back both working copy and commits

From: Andreas Ericsson <ae@op5.se>
Date: Jan 11, 2006, 19:28 UTC
Message-ID: <43C55C51.90305@op5.se>
In-Reply-To: <7ac1e90c0601110832u6fc3a3bcwb7e584445610e53f@mail.gmail.com>

Bahadir Balban wrote:

Show 14 quoted lines

> Hi,
> 
> I made some commits that later on I wanted to cancel. I did:
> 
> % git-branch master-2006-get-rid-of-commits
> 
> % git-reset --hard [sha1id]
> 
> where sha1id is the id of commit I want to revert back to. After this,
> git-log points at the right commit (the one with [sha1id]) as the last
> commit made. However, the working copy is left in the original state,
> i.e with the unwanted changes.. How do I also revert the working
> sources into an earlier state.
>

The branch where you do the reset is the one being reset, so you should have simply done the reset in the original branch without creating a new one. If you're nervous you're gonna screw up you can do this;

git checkout <branch-with-unwanted-commit> git tag anchor git reset --hard <commit-ish>

If you find you've landed on the wrong commit you can undo the change with

git reset --hard anchor

which will restore the branch to wherever you were prior to the first reset. Making an anchor tag is useful if you do several resets. You can use ORIG_HEAD to undo a single reset.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231