From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Marking branch commits not for merge Date: Sun, 15 Feb 2015 14:34:12 -0500 Message-ID: References: <83d25cwgb1.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1424028888 30668 80.91.229.3 (15 Feb 2015 19:34:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 15 Feb 2015 19:34:48 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 15 20:34:36 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 1YN4xg-0002nf-LP for ged-emacs-devel@m.gmane.org; Sun, 15 Feb 2015 20:34:36 +0100 Original-Received: from localhost ([::1]:36377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YN4xf-0007C2-TZ for ged-emacs-devel@m.gmane.org; Sun, 15 Feb 2015 14:34:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YN4xY-00075j-82 for emacs-devel@gnu.org; Sun, 15 Feb 2015 14:34:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YN4xT-0004ei-IX for emacs-devel@gnu.org; Sun, 15 Feb 2015 14:34:28 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:38722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YN4xT-0004eP-DG; Sun, 15 Feb 2015 14:34:23 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t1FJYM5B001148; Sun, 15 Feb 2015 14:34:22 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 93890FF9; Sun, 15 Feb 2015 14:34:12 -0500 (EST) In-Reply-To: <83d25cwgb1.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Feb 2015 19:31:30 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5218=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5218> : inlines <2184> : streams <1390797> : uri <1856065> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:183115 Archived-At: > 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