From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 25 May 2009 11:49:18 GMT
Subject: Re: [RFC PATCH] am: do not do any reset on --abort
Message-ID: <alpine.DEB.1.00.0905251348050.4288@intel-tinevez-2-302>
In-Reply-To: <20090525104308.GA26775@coredump.intra.peff.net>

Hi,

On Mon, 25 May 2009, Jeff King wrote:

> We really have no idea what state the tree is in at this
> point, and whether the user might have done useful work on
> top of it. So let's err on the side of keeping the user's
> data intact.
> 
> The downside is that if they do have cruft to get rid of, or
> want to pretend as if earlier parts of the series that were
> applied did not exist, they must manually "git reset --hard"
> now.
> 
> Signed-off-by: Jeff King <peff@peff.net>

Hmm.  I think I would revert that patch after merging git.git right away.

Can you at least check for a dirty tree and reset --hard if it is clean?  
In the other case, you could still say "you seem to have modifications, 
bla bla bla"...

Ciao,
Dscho