From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Marking branch commits not for merge
Date: Sun, 15 Feb 2015 14:34:12 -0500 [thread overview]
Message-ID: <jwv7fvjas1u.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83d25cwgb1.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Feb 2015 19:31:30 +0200")
> gitmerge.el seems to indicate that just having "merge" somewhere in
> the log message is enough, but I think this is designed to catch
> merge-commits.
No, it's designed to catch messages like "Don't merge to trunk",
i.e. exactly your use case.
> So: how do I tell in the commit log message that a commit is not to be
> merged from the release branch onto master?
Somehow put the words "merge" or "backport" in your commit message.
Stefan
prev parent reply other threads:[~2015-02-15 19:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 17:31 Marking branch commits not for merge Eli Zaretskii
2015-02-15 19:34 ` Stefan Monnier [this message]
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=jwv7fvjas1u.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.