From: Tim Harper <timcharper@gmail.com>
To: Kurt Milligan <kurt@surfmerchants.com>
Cc: git@vger.kernel.org
Subject: Re: commit hooks on merge
Date: Fri, 10 Jul 2009 23:11:40 -0600 [thread overview]
Message-ID: <e1a5e9a00907102211m43522a09l49093ae50ea16e2a@mail.gmail.com> (raw)
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<kurt@surfmerchants.com> 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
>
next prev parent reply other threads:[~2009-07-11 5:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-25 19:43 commit hooks on merge Kurt Milligan
2009-07-11 5:11 ` Tim Harper [this message]
2009-07-11 11:56 ` Kurt Milligan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e1a5e9a00907102211m43522a09l49093ae50ea16e2a@mail.gmail.com \
--to=timcharper@gmail.com \
--cc=git@vger.kernel.org \
--cc=kurt@surfmerchants.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).