From: Eli Zaretskii <eliz@gnu.org>
To: emacs-devel@gnu.org
Subject: Marking branch commits not for merge
Date: Sat, 14 Feb 2015 19:31:30 +0200 [thread overview]
Message-ID: <83d25cwgb1.fsf@gnu.org> (raw)
I couldn't find any clear instructions regarding the case where I'm
pushing a commit to emacs-24 that should not be merged to master. The
available instructions, in CONTRIBUTE, admin/notes/git-workflow, and
admin/notes/repo talk about backported changes, which this one isn't.
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.
So: how do I tell in the commit log message that a commit is not to be
merged from the release branch onto master?
next reply other threads:[~2015-02-14 17:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-14 17:31 Eli Zaretskii [this message]
2015-02-15 19:34 ` Marking branch commits not for merge Stefan Monnier
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=83d25cwgb1.fsf@gnu.org \
--to=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.