From: Josh England <jjengla@sandia.gov>
Date: Tue, 04 Sep 2007 19:36:13 GMT
Subject: Re: [PATCH] Add post-merge hook.
Message-ID: <1188934573.6192.35.camel@beauty>
In-Reply-To: <7vmyw2ny05.fsf@gitster.siamese.dyndns.org>

On Tue, 2007-09-04 at 10:25 -0700, Junio C Hamano wrote:
> "Josh England" <jjengla@sandia.gov> writes:
> 
> >> Two questions.
> >> 
> >>  * Do you want to run the post-merge hook even for a squash
> >>    merge?
> >
> > Yes.  I'd like to run it at any time that the working tree might be
> > updated.
> 
> If that is the case, perhaps your hook may want to get a
> parameter to tell it what kind of "git-merge" invocation it was?
> Squash merge does not even advance the HEAD and is of a very
> different nature from a normal merge.

OK.  Should it just pass in a flag (squash or normal), or are there
other merge types it should need to know about.

-JE