From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Tue, 04 Oct 2016 09:34:04 +0300 Message-ID: <83int8oc6b.fsf@gnu.org> References: <87shseyhfl.fsf@users.sourceforge.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1475562910 17196 195.159.176.226 (4 Oct 2016 06:35:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 06:35:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 08:35:05 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 1brJJT-0002Gl-Pe for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 08:34:51 +0200 Original-Received: from localhost ([::1]:40413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJJS-0008VW-2R for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 02:34:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJIq-0008Uu-8A for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:34:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brJIl-00040C-9X for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:34:11 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brJIl-0003yy-6I; Tue, 04 Oct 2016 02:34:07 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2467 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1brJIj-0004YW-D9; Tue, 04 Oct 2016 02:34:05 -0400 In-reply-to: (message from Noam Postavsky on Mon, 3 Oct 2016 18:59:50 -0400) 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:207971 Archived-At: > From: Noam Postavsky > Date: Mon, 3 Oct 2016 18:59:50 -0400 > > 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? Sorry, forgot to answer. I see no problems, as gitmerge-skip-regexp already handles that: (defvar gitmerge-skip-regexp ;; We used to include "sync" in there, but in my experience it only ;; caused false positives. --Stef "back[- ]?port\\|cherry picked from commit\\|\\(do not\\|no need to\\) merge\\|\ ^^^^^^^^^^^^^^^^^^^^^^^^^ re-?generate\\|bump version\\|from trunk\\|Auto-commit" "Regexp matching logs of revisions that might be skipped. `gitmerge-missing' will ask you if it should skip any matches.")