Re: Moving a file back to an earlier revision.

From: Karl Hasselström <kha@treskal.com>
Date: Apr 3, 2006, 08:29 UTC
Message-ID: <20060403082908.GA4541@diana.vm.bytemark.co.uk>
In-Reply-To: <4dd15d180603311421w7b48cfa4y80d3f9d565d4276f@mail.gmail.com>

On 2006-03-31 17:21:48 -0500, David Ho wrote: [quoting junkio]

Show 16 quoted lines

> > Remember, a branch in git is very cheap, and is a powerful way to
> > keep track of things while you decide which alternate universe to
> > take. And even after you decide, you could always look at and even
> > build on the other universe.
>
> I feel embarrassed to say this but in my branch there are commits to
> the driver and other commits for the board so it looks more like
>
> ---0---D1---B1---B2---D2---B3---B4---
>
> D* - driver changes
> B* - board changes
>
> So to go back to the 0 state I lose my board changes. But I hope
> what I did (in my reply to Linus) is very close to your idea of
> having separate branches.

You could use either stgit or the cherry-picking stuff in git to create a new branch with these commits, but reordered any way you like. (Or, given what you want to use it for, maybe two separate topic branches -- one for board changes and one for driver changes -- that can be merged to produce the end result.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle