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 10:54:42 +0300 Message-ID: <8360p8o8fx.fsf@gnu.org> References: <87shseyhfl.fsf@users.sourceforge.net> <83int8oc6b.fsf@gnu.org> <87h98s38u0.fsf@engster.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1475567744 31588 195.159.176.226 (4 Oct 2016 07:55:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 07:55:44 +0000 (UTC) Cc: emacs-devel@gnu.org, npostavs@users.sourceforge.net To: David Engster Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 09:55: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 1brKZW-0006n4-Hg for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 09:55:30 +0200 Original-Received: from localhost ([::1]:40678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brKZU-0005IN-VX for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 03:55:28 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brKYu-0005I6-1U for emacs-devel@gnu.org; Tue, 04 Oct 2016 03:54:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brKYo-0007Jt-Dy for emacs-devel@gnu.org; Tue, 04 Oct 2016 03:54:51 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brKYo-0007J2-Au; Tue, 04 Oct 2016 03:54:46 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2528 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1brKYm-0001N2-4z; Tue, 04 Oct 2016 03:54:44 -0400 In-reply-to: <87h98s38u0.fsf@engster.org> (message from David Engster on Tue, 04 Oct 2016 08:51:51 +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:207973 Archived-At: > From: David Engster > Cc: Noam Postavsky , emacs-devel@gnu.org > Date: Tue, 04 Oct 2016 08:51:51 +0200 > > > (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.") > > This is only on the master branch, though. I've no idea why I didn't > commit this to emacs-25... The merges are only done on master, right?