From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 23:24:45 +0100 Message-ID: <877fyg9t8y.fsf@engster.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> <87vbm0a6zv.fsf@engster.org> <8361e0o7ee.fsf@gnu.org> <87fvd4trzx.fsf@igel.home> <831tooo576.fsf@gnu.org> <87k32ga3dh.fsf@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417127119 12819 80.91.229.3 (27 Nov 2014 22:25:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 22:25:19 +0000 (UTC) Cc: Eli Zaretskii , Andreas Schwab , tzz@lifelogs.com, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 23:25:13 2014 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 1Xu7Ut-00059x-RB for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 23:25:11 +0100 Original-Received: from localhost ([::1]:41703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu7Ut-00039y-9i for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 17:25:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu7Ul-00035P-KP for emacs-devel@gnu.org; Thu, 27 Nov 2014 17:25:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu7Ud-0000P9-67 for emacs-devel@gnu.org; Thu, 27 Nov 2014 17:25:03 -0500 Original-Received: from randomsample.de ([5.45.97.173]:55838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu7Uc-0000Om-T5; Thu, 27 Nov 2014 17:24:55 -0500 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=iOUq2k3aFO5uXL/JoeRuJDEySPYE/9Qii2fO6CQpY70=; b=DNqXd/iKDbWYHIKsWmIO7glGFlmK4POg42S0CoyvBcsuuzwJCgTW8NykDT2/Ia4Y74WZ6NC2GGEfS8T/O5VmEbocZe/vfpmZCdE6f3kbEPGgWcoN/xsW6qokO4FTAhPT; Original-Received: from ip4d154d80.dynamic.kabel-deutschland.de ([77.21.77.128] helo=spaten) by randomsample.de with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Xu7UZ-00023S-4d; Thu, 27 Nov 2014 23:24:51 +0100 In-Reply-To: (Stefan Monnier's message of "Thu, 27 Nov 2014 16:05:50 -0500") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux) 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.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:178385 Archived-At: Stefan Monnier writes: >> You'll have to checkout master if you want to merge into it, so I did >> not see the point putting it into emacs-24. If you feel strongly about >> it, I can backport it. > > No, it's fine on master, thanks. I've also added some documentation in admin/notes/git-workflow. -David