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 11:15:10 +0200 Message-ID: <83fv09djs1.fsf@gnu.org> References: <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> <87d1vdfurp.fsf@igel.home> <83wptldn2x.fsf@gnu.org> <87io55km09.fsf@isaac.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447496680 21903 80.91.229.3 (14 Nov 2015 10:24:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 10:24:40 +0000 (UTC) Cc: jwiegley@gmail.com, schwab@linux-m68k.org, emacs-devel@gnu.org To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 11:24:31 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 1ZxY0Q-0006KY-MA for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 11:24:26 +0100 Original-Received: from localhost ([::1]:33521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxY0J-0001Wi-49 for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 05:24:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxWvd-0007Vc-8x for emacs-devel@gnu.org; Sat, 14 Nov 2015 04:15:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxWvZ-0005pk-VJ for emacs-devel@gnu.org; Sat, 14 Nov 2015 04:15:25 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:55121) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxWvZ-0005pf-O2 for emacs-devel@gnu.org; Sat, 14 Nov 2015 04:15:21 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NXS00B00RWX4T00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 14 Nov 2015 11:15:20 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXS00BVQSDJ3P20@a-mtaout23.012.net.il>; Sat, 14 Nov 2015 11:15:20 +0200 (IST) In-reply-to: <87io55km09.fsf@isaac.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:194446 Archived-At: > From: David Engster > Cc: Andreas Schwab , jwiegley@gmail.com, emacs-devel@gnu.org > Date: Sat, 14 Nov 2015 09:45:10 +0100 > > >> ??? Just fast forward it. > > > > I didn't know how to do that (can you tell?). > > By merging master into emacs-25. Git will do a fast-forward by default > if it is possible (use --ff-only to abort otherwise). Thanks, will do in the future. > Regarding your 'Backport' messages in the cherry-picks: You only need to > do that when there was a conflict. Otherwise, gitmerge.el should detect > cherry-picks through the cherry-mark and automatically mark them as to > be skipped. However, I realize now that I'm calling the wrong log > command for that; I'll fix that over the weekend. Thanks. Please also consider whether we need some changes in gitmerge.el now that we produce ChangeLog from the Git log.