From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Marking branch commits not for merge Date: Sat, 14 Feb 2015 19:31:30 +0200 Message-ID: <83d25cwgb1.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1423935110 1865 80.91.229.3 (14 Feb 2015 17:31:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Feb 2015 17:31:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 14 18:31:41 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YMgZA-0002IE-Ue for ged-emacs-devel@m.gmane.org; Sat, 14 Feb 2015 18:31:41 +0100 Original-Received: from localhost ([::1]:60628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMgZA-0000hI-8P for ged-emacs-devel@m.gmane.org; Sat, 14 Feb 2015 12:31:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMgZ6-0000h2-Tp for emacs-devel@gnu.org; Sat, 14 Feb 2015 12:31:38 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMgZ1-0000NK-R1 for emacs-devel@gnu.org; Sat, 14 Feb 2015 12:31:36 -0500 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:47988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMgZ1-0000N6-Ir for emacs-devel@gnu.org; Sat, 14 Feb 2015 12:31:31 -0500 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NJR00D00V1O2100@mtaout29.012.net.il> for emacs-devel@gnu.org; Sat, 14 Feb 2015 19:27:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NJR00BXBV5XNU10@mtaout29.012.net.il> for emacs-devel@gnu.org; Sat, 14 Feb 2015 19:27:33 +0200 (IST) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:183069 Archived-At: 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?