From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Mon, 3 Oct 2016 18:59:50 -0400 Message-ID: References: <87shseyhfl.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1475535645 12897 195.159.176.226 (3 Oct 2016 23:00:45 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 3 Oct 2016 23:00:45 +0000 (UTC) To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 01:00:40 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1brCDn-0001gu-KB for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 01:00:31 +0200 Original-Received: from localhost ([::1]:39428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brCDm-0006Nm-61 for ged-emacs-devel@m.gmane.org; Mon, 03 Oct 2016 19:00:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brCDB-0006Nf-Gd for emacs-devel@gnu.org; Mon, 03 Oct 2016 18:59:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brCD9-0004E6-QP for emacs-devel@gnu.org; Mon, 03 Oct 2016 18:59:52 -0400 Original-Received: from mail-oi0-x22e.google.com ([2607:f8b0:4003:c06::22e]:36435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brCD9-0004Df-KI for emacs-devel@gnu.org; Mon, 03 Oct 2016 18:59:51 -0400 Original-Received: by mail-oi0-x22e.google.com with SMTP id m72so46483474oik.3 for ; Mon, 03 Oct 2016 15:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to; bh=zkdSYnCtxSmKEpCON1Btpfvxc+o4SqOFlk84ELa5A6E=; b=qljDVabv7Jkrn7fcI/jTeqQau54Niab9gm1QuafQXIs4PkLjcUjDYkcypnjZmVxvgd nyGHjkhyw4ka0AglOCBu3+GmqVJbkh33++h1UPtt/FlJ3TUgnmXO4y44o/t4pLOm/hP9 fClUozbj/tX9bsbaMQMI5trv4uMCMrlGX8wJylTu91MFndCBdrJsYEsP4TDBboB9pJcL 021OAq45s8dT6GvKI6iD77bwFEqljQLT/+lBgk9Ykmuj2gndOc1TxHLMPGMUJ/40ns+1 psaJ03T3VXsBY+QAJTe0Xe8NRy7htgJgHizA2kFpbLrr5nYi18oApnPTkYp5KjwWm1ZU vd3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to; bh=zkdSYnCtxSmKEpCON1Btpfvxc+o4SqOFlk84ELa5A6E=; b=OuTEDpaGpYIQkJQD65ZsTjQ+oZBjz6M5f05m/23/O/yuxKlDOAcMRjI3KdTSVjGI6a GtlAmUfGIqRSV9EyhXXB1DVgU5MN3lZDPD67E7hcfShJVxtG0MRzcFCIj5xSzyUclKXe BBT0ErxSAdlkG6dA5FY7AJLZbYWfXYyocehrkm83tbQs7hSRZp7tXrRP4UhR1WIaBXXq Zqy+idBjEayw9dvSVuwLbPSh5G+lAs36uyjeVM0aNmg5nPebTiXigQeGalGuSDQFuBhb YZVFPqxtVVFcSa/sO1lmcI3iNOZpPZV+scRibbavbxhr5ysvipGNqkT2K4+zo4gNeycc E5aA== X-Gm-Message-State: AA6/9RnhQvWbQl/yXeWn49S/7+MqMu/sObD+f2Oxce5Yu3eIYnFNNeHvnSW8dhR2IMJF5DSJUMA6p1Rtgg4v4A== X-Received: by 10.157.42.39 with SMTP id t36mr296493ota.14.1475535590985; Mon, 03 Oct 2016 15:59:50 -0700 (PDT) Original-Received: by 10.157.42.16 with HTTP; Mon, 3 Oct 2016 15:59:50 -0700 (PDT) In-Reply-To: <87shseyhfl.fsf@users.sourceforge.net> X-Google-Sender-Auth: SMpb0H1ujxxGHy0a1K9SpRdsF_k X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::22e 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:207968 Archived-At: On Sun, Oct 2, 2016 at 10:05 AM, wrote: > > Git added "cherry picked from commit" but it looks like > gitmerge-skip-regexp wouldn't match that, should I change it to match? > What about this question?