From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Referring to revisions in the git future. Date: Wed, 29 Oct 2014 16:55:52 +0200 Message-ID: <83lhnz0vt3.fsf@gnu.org> References: <20141028223312.GB6630@acm.acm> <87fve7b6p7.fsf@fencepost.gnu.org> <20141029095248.GA14601@thyrsus.com> <87y4rz9m4d.fsf@fencepost.gnu.org> <83ppdb0wv8.fsf@gnu.org> <87fve79c57.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1414594589 28916 80.91.229.3 (29 Oct 2014 14:56:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 29 Oct 2014 14:56:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 29 15:56:22 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 1XjUfc-0008A6-Ti for ged-emacs-devel@m.gmane.org; Wed, 29 Oct 2014 15:56:21 +0100 Original-Received: from localhost ([::1]:46694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUfc-0007Yf-IA for ged-emacs-devel@m.gmane.org; Wed, 29 Oct 2014 10:56:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUfT-0007Q9-Oz for emacs-devel@gnu.org; Wed, 29 Oct 2014 10:56:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjUfN-00075a-OU for emacs-devel@gnu.org; Wed, 29 Oct 2014 10:56:11 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:33598) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUfG-00074M-Lv; Wed, 29 Oct 2014 10:55:58 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NE700200NNVNR00@mtaout27.012.net.il>; Wed, 29 Oct 2014 16:50:58 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NE700HPSNWY2UA0@mtaout27.012.net.il>; Wed, 29 Oct 2014 16:50:58 +0200 (IST) In-reply-to: <87fve79c57.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 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:176008 Archived-At: > From: David Kastrup > Cc: emacs-devel@gnu.org > Date: Wed, 29 Oct 2014 15:35:48 +0100 > > Eli Zaretskii writes: > > >> From: David Kastrup > >> Date: Wed, 29 Oct 2014 12:00:18 +0100 > >> > >> Each commit tends to come with its own manual conflict resolution > >> for ChangeLog. > > > > Not if you have git-merge-changelog installed. > > If it were part of the official workflow We don't have "the official workflow" for git. The Powers That Be claim that it's unnecessary, and even harmful. I personally find it invaluable, as I do the equivalent bzr plugin. > it would be part of Emacs or at least ELPA. It's a C program that is available as a Gnulib module. Not sure how that is relevant to ELPA.