From: Tim Harper Date: Sat, 11 Jul 2009 05:11:40 GMT Subject: Re: commit hooks on merge Message-ID: In-Reply-To: <4A43D37B.20203@surfmerchants.com> Kurt I don't think there is a hook to prevent a merge from occurring. I mean, you could probably rename git-merge, and then put a wrapper script in its place. That script could call the hook for the current repository, if it exists and you could implement pre-merge. This is if you REALLY REALLY want to do it :) Tim On Thu, Jun 25, 2009 at 1:43 PM, Kurt Milligan wrote: > Hi > > I asked this in #git, and did a quick Google search to no avail... > > According to the docs, merge does an auto-commit, but it seems that the > pre/post commit hooks are not run for this commit. Is that intentional? Is > there a way I can make them run for the merge commit? I see there is a > post-merge hook, but that doesn't really help me if I want to stop the > merge... > > Thanks in advance > > -Kurt > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html >