From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Sat, 14 Nov 2015 11:27:48 +0000 Message-ID: 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: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1447520497 15680 80.91.229.3 (14 Nov 2015 17:01:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 17:01:37 +0000 (UTC) Cc: emacs-devel To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 18:01: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 1ZxeCl-0001bd-Rl for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 18:01:36 +0100 Original-Received: from localhost ([::1]:35870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxeCk-0003iG-Sx for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 12:01:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxYzn-0005bg-S6 for emacs-devel@gnu.org; Sat, 14 Nov 2015 06:27:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxYzn-0001lH-1H for emacs-devel@gnu.org; Sat, 14 Nov 2015 06:27:51 -0500 Original-Received: from mail-lb0-x235.google.com ([2a00:1450:4010:c04::235]:33130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxYzl-0001ks-0Y; Sat, 14 Nov 2015 06:27:49 -0500 Original-Received: by lbbkw15 with SMTP id kw15so66862495lbb.0; Sat, 14 Nov 2015 03:27:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=951iVjnivTrrqS83v/d9MuuDxUXb9Ra21mEen9psd1s=; b=lEq4C3JmndhwbHa745Xqbz48zK24isIs/nxDAtUTpQBajSC1z839b7GWe/RZ2D5ijW VdEFybypQX3O1gO/Jhxb4tq+Ilcl+qvit8WEIEe8SlfIDUOuQuDWFT536p71J3Vl/dqu s+dHaG7dyFUaGtGVhx/i6zUy821W/F8IGFJdBx4HO2n+Q1pnUt5EFqaOEKOdNkoUfJxL N7qdkaC/bwkGfQK40CPjSP84ZGUNMxpo7N7J5zepV6/TODC2gTlPWxWdzHsCDJS+QE2m u67AthT55JrnyBA0d0YEZqeEmNdyWAH+XLz8OYkUfYWFC1HsULS3sGiWC3G/OtE1UHj1 jS7Q== X-Received: by 10.112.235.65 with SMTP id uk1mr12649445lbc.118.1447500468336; Sat, 14 Nov 2015 03:27:48 -0800 (PST) Original-Received: by 10.112.63.70 with HTTP; Sat, 14 Nov 2015 03:27:48 -0800 (PST) In-Reply-To: <831tbtfyd4.fsf@gnu.org> X-Google-Sender-Auth: ngylBtk9fTfT3QEeTLjGuN7-6CE X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::235 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:194459 Archived-At: 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? I need to do push a commit to emacs-25 that is not to be merged back to master.