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: Re: Freeze is almost here Date: Sat, 14 Nov 2015 13:55:43 +0200 Message-ID: <838u60eqww.fsf@gnu.org> References: <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> <87io5bv1it.fsf@lifelogs.com> <87egfzuwca.fsf@lifelogs.com> <876118u6f2.fsf@lifelogs.com> <87io56qgid.fsf@lifelogs.com> <838u61g0sr.fsf@gnu.org> <837fllg06m.fsf@gnu.org> <87d1vdy8at.fsf@Rainer.invalid> <831tbtfyd4.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447522637 15345 80.91.229.3 (14 Nov 2015 17:37:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 17:37:17 +0000 (UTC) Cc: emacs-devel@gnu.org To: bruce.connor.am@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 18:37:08 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 1Zxel8-0004Pj-8v for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 18:37:06 +0100 Original-Received: from localhost ([::1]:36216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zxel7-0006Ba-GU for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 12:37:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxZQz-0000QV-LD for emacs-devel@gnu.org; Sat, 14 Nov 2015 06:55:58 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxZQw-0000iX-FP for emacs-devel@gnu.org; Sat, 14 Nov 2015 06:55:57 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:34438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxZQw-0000iG-7M for emacs-devel@gnu.org; Sat, 14 Nov 2015 06:55:54 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NXS00600ZRMWR00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 14 Nov 2015 13:55:52 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXS0066RZT4NZ80@a-mtaout20.012.net.il>; Sat, 14 Nov 2015 13:55:52 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:194460 Archived-At: > Date: Sat, 14 Nov 2015 11:27:48 +0000 > From: Artur Malabarba > Cc: emacs-devel > > 2015-11-13 20:17 GMT+00:00 Eli Zaretskii : > > Anyway, I already pushed all the cherry-picks (with a special marker > > that should exempt them from merging back via gitmerge.el). > > What is the marker you use? "Backport". This is described in CONTRIBUTE; I just made it a tad more clear.