On Tue, 2007-09-04 at 10:25 -0700, Junio C Hamano wrote: > "Josh England" <jjengla@xxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html