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: emacs-25 586b213: * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bug#23411) Date: Sun, 01 May 2016 21:03:20 +0300 Message-ID: <83mvo9mz9z.fsf@gnu.org> References: <20160501152515.31964.66193@vcs.savannah.gnu.org> <87shy1pz0l.fsf@gnus.org> <83twihn5mx.fsf@gnu.org> <87eg9lpw80.fsf@gnus.org> <87a8k9pvtb.fsf@gnus.org> <8737q13dli.fsf@engster.org> <874mahpuh6.fsf@gnus.org> <87y47t1yor.fsf@engster.org> <87oa8poelk.fsf@gnus.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1462125844 6319 80.91.229.3 (1 May 2016 18:04:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 May 2016 18:04:04 +0000 (UTC) Cc: deng@randomsample.de, emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 01 20:04:01 2016 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 1awviq-00018G-J0 for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 20:04:00 +0200 Original-Received: from localhost ([::1]:33832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awvim-0001Zq-Rj for ged-emacs-devel@m.gmane.org; Sun, 01 May 2016 14:03:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awviT-0001M7-TB for emacs-devel@gnu.org; Sun, 01 May 2016 14:03:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1awviI-0003hN-AL for emacs-devel@gnu.org; Sun, 01 May 2016 14:03:32 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1awviI-0003gp-7h; Sun, 01 May 2016 14:03:26 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2777 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1awviC-0003CM-1E; Sun, 01 May 2016 14:03:20 -0400 In-reply-to: <87oa8poelk.fsf@gnus.org> (message from Lars Ingebrigtsen on Sun, 01 May 2016 19:47:03 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:203498 Archived-At: > From: Lars Ingebrigtsen > Cc: Eli Zaretskii , emacs-devel@gnu.org > Date: Sun, 01 May 2016 19:47:03 +0200 > > David Engster writes: > > > Even if you have a conflict, the '-x' will already append "cherry picked > > from commit...", which we should probably just add to > > gitmerge-skip-regexp anyway. > > Ok; I've now done the cherry-pick on all 65 doc fixes, and the result is > without conflicts, and emacs-25 still builds. :-) Thanks. > I just wanted to triple-check before pushing: Is this the way to do it? What is "this" that you are asking about?