From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Thu, 27 Nov 2014 19:28:22 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87r3wo5ftl.fsf@lifelogs.com> 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> <877fyg9t8y.fsf@engster.org> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417134500 21128 80.91.229.3 (28 Nov 2014 00:28:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 00:28:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 01:28: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 1Xu9Pw-00025y-UI for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 01:28:13 +0100 Original-Received: from localhost ([::1]:42084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9Pw-0002yj-Fz for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 19:28:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9Pn-0002yM-HW for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:28:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu9Ph-0003i6-4v for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:28:03 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:53736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu9Pg-0003hl-UQ for emacs-devel@gnu.org; Thu, 27 Nov 2014 19:27:57 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xu9Pf-0001zh-8o for emacs-devel@gnu.org; Fri, 28 Nov 2014 01:27:55 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:27:55 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 28 Nov 2014 01:27:55 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:LNMZeDC4Qwpm/8mYITaYCG8fZnw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178386 Archived-At: On Thu, 27 Nov 2014 23:24:45 +0100 David Engster wrote: DE> 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. DE> I've also added some documentation in admin/notes/git-workflow. I think gitmerge.el is really clever :) I learned a lot reading it. One request: maybe it could log what it does, especially the shell commands, a little better. Ted