From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: When do we merge the commits from emacs-25 onto master? Date: Mon, 23 Nov 2015 14:05:11 -0800 Organization: UCLA Computer Science Department Message-ID: <56538D97.80905@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1448316332 28064 80.91.229.3 (23 Nov 2015 22:05:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2015 22:05:32 +0000 (UTC) To: bruce.connor.am@gmail.com, emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 23:05:24 2015 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 1a0zEi-00076g-3x for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 23:05:24 +0100 Original-Received: from localhost ([::1]:34869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zEi-0003om-QG for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 17:05:24 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zEc-0003jH-TG for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:05:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0zEX-0001aP-UT for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:05:18 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:33941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zEX-0001aL-Pd for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:05:13 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id E79ED1601C0; Mon, 23 Nov 2015 14:05:12 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id meKUqAdXYbSb; Mon, 23 Nov 2015 14:05:12 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3FD56160633; Mon, 23 Nov 2015 14:05:12 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id l5SV5Lf0t5fE; Mon, 23 Nov 2015 14:05:12 -0800 (PST) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 2337A1601C0; Mon, 23 Nov 2015 14:05:12 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:195146 Archived-At: On 11/23/2015 12:36 PM, Artur Malabarba wrote: > Do we periodically merge stuff from the emacs-25 branch onto master? Yes. And you're welcome to do it. We're better off if more people know how to do it. Please see admin/notes/git-workflow. It needs updating (at least to change "emacs-24" to "emacs-25"), and you can do that before merging....