From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 Date: Tue, 12 Jan 2016 12:09:34 -0500 Message-ID: References: <20160112070839.6841.77764@vcs.savannah.gnu.org> <0mlh7u7nds.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452618598 28481 80.91.229.3 (12 Jan 2016 17:09:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2016 17:09:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 18:09:55 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 1aJ2SB-0005El-Dh for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 18:09:55 +0100 Original-Received: from localhost ([::1]:33277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2SA-0001uo-Kl for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2016 12:09:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Rs-0001oY-M6 for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:09:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJ2Rr-0000FO-Tb for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:09:36 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJ2Rr-0000FK-R6 for emacs-devel@gnu.org; Tue, 12 Jan 2016 12:09:35 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1aJ2Rr-0007VJ-54; Tue, 12 Jan 2016 12:09:35 -0500 X-Spook: Verisign Blister agent TWA Narcos EBS Al Qaeda in the X-Ran: }FtpQ=u>7p&ne3o1:rsnO?0IH>NETPGn+5UVH>:bace%?$"Me#FErhhX{@w:W,8:?4 (John Wiegley's message of "Tue, 12 Jan 2016 09:03:27 -0800") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:198089 Archived-At: Oh, I guess it is because the original commit message happened to contain the word "merge", and thus match gitmerge-skip-regexp. IIRC, gitmerge should ask you whether to skip a given commit, not just unconditionally skip it. Some judgement is required when deciding to answer yes or no to that prompt. The gitmerge regexp is biased to match more rather than less.