From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xue Fuqiao Newsgroups: gmane.emacs.devel Subject: Re: Marking commits not to be merged Date: Fri, 12 Feb 2016 08:58:36 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1455238744 3205 80.91.229.3 (12 Feb 2016 00:59:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Feb 2016 00:59:04 +0000 (UTC) Cc: Emacs-devel To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 12 01:58:58 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 1aU24X-0001kj-Pc for ged-emacs-devel@m.gmane.org; Fri, 12 Feb 2016 01:58:57 +0100 Original-Received: from localhost ([::1]:54989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aU24W-0005xY-M5 for ged-emacs-devel@m.gmane.org; Thu, 11 Feb 2016 19:58:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aU24E-0005uf-RY for emacs-devel@gnu.org; Thu, 11 Feb 2016 19:58:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aU24E-0004mT-2Z for emacs-devel@gnu.org; Thu, 11 Feb 2016 19:58:38 -0500 Original-Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]:38130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aU24D-0004mO-Sy; Thu, 11 Feb 2016 19:58:37 -0500 Original-Received: by mail-ig0-x236.google.com with SMTP id y8so306372igp.1; Thu, 11 Feb 2016 16:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=v0MOL5xsZ67fhd5JLwCg8P1VMc+P4CXhrS9lUWGplKQ=; b=v97NcrUdWmNX0vF0i0qleLlB8X/GSslYNvvbMi25malCq4uO1MuSL06qYao4gkmoyh 0VA836OHCFRHte5XMWKJisaHZgOXlCn+3s/Bn7uS2iFOtC2bS/6BFdEeJlS+PKjNfa6H HSJgNCOxoJzifRkA7Hi5elOvogZjgskOSUnp7U6NlMwv30w1PI5yw+GMDfXi9Nono2dX C7iAZSDSNhDTFAdjueLaTusvZ8xU4+yuktWFaT5W2OmCWnRIpRZGHlDkTSEnQWvOPa47 Fwbc6CXazXWGOhKqQ/3bWwe5b1lUC5pYxOTlpI8kKUMCk07waJcNYt5ajWu+z7zLFdO5 w0nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=v0MOL5xsZ67fhd5JLwCg8P1VMc+P4CXhrS9lUWGplKQ=; b=JAxuc1YNQcF9XesgqbojahP2mGQV7r+P6oixo9CUoRcWXBcfDwa8ou8nji5yKix1hf tzh/AUsM0nJTwKx/4xkATduBTjkwNVyYJWLkHHMtlQuC5c/a6cWhqoHrk1xTd6fEvhRk QsRI7mnco67RdTda1YFb8GLkLSF50whvfcJX/DjOmlgwrpjoYPxgANbNd+9zt/mw04Tl 2axVTQG+G1ZjE49FvEabFCww2WB/7QlFz5zxVQLJlBCXKrT4w+3YLJBMie0i0YAWIc1G yFH4jKpRJhkgX+ziqN+/toVjd+pbE6sdccFGjehAx2MF7HVv+v7v4R3+Dd5nEMyEr+33 U/Eg== X-Gm-Message-State: AG10YORspw7IJBZreNogjlIs7j7u0H2fndeKJ5oz9SRwlMC0TXMmvC242lflOQzb1Y+OX6oFvE7ddQ2LaryODg== X-Received: by 10.50.43.134 with SMTP id w6mr1016623igl.16.1455238717038; Thu, 11 Feb 2016 16:58:37 -0800 (PST) Original-Received: by 10.79.30.131 with HTTP; Thu, 11 Feb 2016 16:58:36 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c05::236 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:199783 Archived-At: On Fri, Feb 12, 2016 at 12:37 AM, Glenn Morris wrote: Hi Glenn, > If you want to mark a commit on emacs-25 as not to be merged to master, > you can simply write eg "Do not merge to master" in the commit message. > Anything that matches gitmerge-skip-regexp will do. > You don't have to always write "Backport". > "Backport" seems to be being used to as a label for some commits that > aren't actually backports from master, which I find confusing. > Thanks for the hint! Would you please add it to CONTRIBUTE and/or admin/notes/git-workflow?