From: Howard Miller <howard@e-learndesign.co.uk>
Date: Thu, 22 Oct 2009 20:58:03 GMT
Subject: Re: Any way to "flatten" a series of changes in git
Message-ID: <26ae428a0910221358r47434b4uf7ec71f9376b9f75@mail.gmail.com>
In-Reply-To: <8c9a060910221351w12e6c610kb842263e1c02ea63@mail.gmail.com>

>
> Alternatively, you could use git merge --squash
>
> git checkout master
> git merge --squash topic
>
> See git-merge(1) for details.
>
> rebase --interactive it excellent for cleaning up history, especially
> if you want to end up with more than one commit at the end.  merge
> --squash is usually sufficient if all you need is one commit at the
> end.
>

Brilliant, thanks everybody!! I'll go and back up my database and have
a play with these options.