From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 09 Jun 2008 20:34:55 GMT
Subject: Re: [RFC/PATCH] Add git-squash tool and tests
Message-ID: <alpine.DEB.1.00.0806092133260.1783@racer>
In-Reply-To: <1213043398-30524-1-git-send-email-s-beyer@gmx.net>

Hi,

On Mon, 9 Jun 2008, Stephan Beyer wrote:

> git-squash is a simple command that, given the parent commit of X,
> squashes the commits X..HEAD into one.

Isn't it possible to do this with something like

	$ git reset --hard X^ &&
	  git merge --no-ff --squash HEAD@{1}

?

Ciao,
Dscho