Re: Any way to "flatten" a series of changes in git

On Thu, Oct 22, 2009 at 9:58 PM, Howard Miller <howard@e-learndesign.co.uk> wrote:

>> git merge --squash topic

>> rebase --interactive it excellent for cleaning up history, especially [...]

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

I don't think you need it. when you rebase or squash git don't throw away your commits

when I do things like that I usually create a new branch to do my tests

if I'm happy with the result I can do

git checkout myRealBranch git reset --hard myTestBranch # do the push/svn dcommit/whatever

if I'm not happy I can start all over again just doing:

git checkout MyTestBranch git reset --hard myRealBranch

regards, Daniele