From: Steven Grimm <koreth@midwinter.com>
Date: Tue, 04 Sep 2007 20:52:06 GMT
Subject: Re: [PATCH] Add post-merge hook.
Message-ID: <46DDC576.3080708@midwinter.com>
In-Reply-To: <1188937975.6192.59.camel@beauty>

Josh England wrote:
> I'm thinking that it
> will be sufficient to pass a flag indicating whether the working tree
> has been modified or not.  The flag can be set for normal merge and
> fast-forward merges, and unset for up-to-dates and squash merges.
>   

Squash merges modify the working tree. In fact, that's *all* they do -- 
they don't commit anything.

-Steve