Re: Moving a file back to an earlier revision.

From: Linus Torvalds <torvalds@osdl.org>
Date: Mar 31, 2006, 21:26 UTC
Message-ID: <Pine.LNX.4.64.0603311324040.27203@g5.osdl.org>
In-Reply-To: <4dd15d180603311313t7781f2ebk616276e9134f6472@mail.gmail.com>

On Fri, 31 Mar 2006, David Ho wrote:

Show 8 quoted lines

> 
> I am working on a board port on a separate branch.  The branch has
> accumulated several revision of changes to a driver I worked on.  Now,
> someone has come along with a better fix so I want to help test his
> patch.  To do that I have to revert my changes to that driver (several
> revisions back) before I can apply his patch.
> 
> What would be a convenient way to do that with git?

Don't revert.

Just pick the point you want to start testing his patch at (with gitk, for example, just cut-and-paste the sha1), and do

	git checkout -b test-better-fix <sha1>

which creates a new branch ("test-better-fix") that starts at that point, and checks it out.

Then, just apply the patch, and off you go. You now have _both_ his patch and your own series in separate branches, so you can cherry-pick and do other things (like do a "diff" between branches - which can sometimes be useful too to verify that the two branches end up fixing all the same problems).

		Linus