From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master 83587bb 1/2: Correctly cache sorted completions in icomplete--sorted-completions Date: Thu, 26 Dec 2019 19:22:19 +0200 Message-ID: <83d0cbq9x0.fsf@gnu.org> References: <20191225175851.21930.86980@vcs0.savannah.gnu.org> <20191225175852.DE63E20997@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="100614"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org, dgutov@yandex.ru To: =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 26 18:23:04 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ikWql-000PyL-2T for ged-emacs-devel@m.gmane.org; Thu, 26 Dec 2019 18:23:03 +0100 Original-Received: from localhost ([::1]:55380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikWqj-0005dJ-9f for ged-emacs-devel@m.gmane.org; Thu, 26 Dec 2019 12:23:01 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51288) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikWq9-0005BS-6W for emacs-devel@gnu.org; Thu, 26 Dec 2019 12:22:26 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ikWq7-0005KV-Q4; Thu, 26 Dec 2019 12:22:23 -0500 Original-Received: from [176.228.60.248] (port=2364 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ikWq7-0007ig-6l; Thu, 26 Dec 2019 12:22:23 -0500 In-reply-to: (message from =?utf-8?B?Sm/Do28gVMOhdm9yYQ==?= on Thu, 26 Dec 2019 11:48:09 +0000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:243658 Archived-At: > From: João Távora > Date: Thu, 26 Dec 2019 11:48:09 +0000 > Cc: emacs-devel > > I will cherry-pick them to 27.1, yes, with the "don't merge" hint. git-merge.el automatically excluded cherry-picks from merging back to master, so you need not do anything special, besides invoking "git cherry-pick" with the -x option.