From: Tim Chase <git@tim.thechases.com>
To: git@vger.kernel.org
Subject: Preventing merges from one branch into others
Date: Thu, 7 Feb 2013 13:14:40 -0600 [thread overview]
Message-ID: <20130207131440.716c1022@bigbox.christie.dr> (raw)
[tried IRC to no avail]
I've been trying to find a way to prevent myself from merging a
client-specific branch back into my dev/master branches. Is there an
easy/straightforward way to do this (perhaps via a hook)? I didn't
see any sort of "pre-merge" hook script. Visualized:
A -> B -> C [dev]
\
-> Q -> R -> S [customer-specific]
and I want to ensure that changes Q/R/S never find their way back
into dev.
So I was hoping some sort of "hey, you're an idiot for trying to merge
$CUSTOMER_BRANCH back into dev/master" warning. :-)
-tkc
next reply other threads:[~2013-02-07 19:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-07 19:14 Tim Chase [this message]
2013-02-07 19:38 ` Preventing merges from one branch into others Junio C Hamano
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=20130207131440.716c1022@bigbox.christie.dr \
--to=git@tim.thechases.com \
--cc=git@vger.kernel.org \
/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).