Re: [RFC/PATCH] Add git-squash tool and tests

From

Paolo Bonzini <bonzini@gnu.org>

Date

Jun 9, 2008, 20:53 UTC

Message-ID

<484D984F.20700@gnu.org>

In-Reply-To

<alpine.DEB.1.00.0806092133260.1783@racer>

> Isn't it possible to do this with something like
> 
> 	$ git reset --hard X^ &&
> 	  git merge --no-ff --squash HEAD@{1}

Yes, that's true!  And very cool.

In turn, ...

> Junio, this could be a backend for the zucchini instruction, by just
>  zucchini <n>  =>  git-squash "HEAD~$(expr $n + 1)"    ;-) 

... zucchini becomes

   git reset --hard HEAD~$(expr $n)
   git merge --no-ff --squash HEAD@{1}

Paolo