From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Tue, 04 Oct 2016 08:07:50 +0200 Message-ID: <87lgy43avd.fsf@engster.org> References: <87shseyhfl.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1475561301 16202 195.159.176.226 (4 Oct 2016 06:08:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Oct 2016 06:08:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Cc: Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 04 08:08:18 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 1brItc-0002WY-3F for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 08:08:08 +0200 Original-Received: from localhost ([::1]:40330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brItd-0003a2-M9 for ged-emacs-devel@m.gmane.org; Tue, 04 Oct 2016 02:08:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brItY-0003Zs-3y for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:08:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brItT-0006CA-Uq for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:08:03 -0400 Original-Received: from randomsample.de ([5.45.97.173]:36821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brItT-00064K-M6 for emacs-devel@gnu.org; Tue, 04 Oct 2016 02:07:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=QAssAQhWECLUtXdWCz15bB55DXE5N45wiLLVoAVx1SE=; b=JpmqZEw9MrO9fNC1khzI+KwDnyqjYqdfYPBHDzif4RbW1hghqohe7KqUNpeZdOmWMd3rrsNWTrH7oEKrFtF04kcqQd9D8EHSArmXusnqAFwJEYtdHuukggvfkxTo3fGj; Original-Received: from ip4d167ffb.dynamic.kabel-deutschland.de ([77.22.127.251] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1brItN-00036n-A2; Tue, 04 Oct 2016 08:07:53 +0200 In-Reply-To: (Noam Postavsky's message of "Mon, 3 Oct 2016 18:59:50 -0400") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:207970 Archived-At: Noam Postavsky writes: > 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? If the cherry-pick succeeds without conflict, git can detect them through the patch-id and add a cherry-mark, which in turn will make gitmerge ignore those commits. If there is a conflict, you will have to manually commit anyway and you should add 'backport' to the commit message. -David