From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: Referring to revisions in the git future. Date: Wed, 29 Oct 2014 15:35:48 +0100 Message-ID: <87fve79c57.fsf@fencepost.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1414593393 7026 80.91.229.3 (29 Oct 2014 14:36:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 29 Oct 2014 14:36:33 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 29 15:36:25 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 1XjUMK-0005Ar-SN for ged-emacs-devel@m.gmane.org; Wed, 29 Oct 2014 15:36:25 +0100 Original-Received: from localhost ([::1]:46559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUMK-0004KP-GF for ged-emacs-devel@m.gmane.org; Wed, 29 Oct 2014 10:36:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUM8-0004KE-MR for emacs-devel@gnu.org; Wed, 29 Oct 2014 10:36:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjUM2-000120-VY for emacs-devel@gnu.org; Wed, 29 Oct 2014 10:36:12 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUM2-00011w-Sp for emacs-devel@gnu.org; Wed, 29 Oct 2014 10:36:06 -0400 Original-Received: from localhost ([127.0.0.1]:51133 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjUM1-00057M-VQ; Wed, 29 Oct 2014 10:36:06 -0400 Original-Received: by lola (Postfix, from userid 1000) id 77EACE062F; Wed, 29 Oct 2014 15:35:48 +0100 (CET) In-Reply-To: <83ppdb0wv8.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 29 Oct 2014 16:32:59 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:175999 Archived-At: 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, it would be part of Emacs or at least ELPA. -- David Kastrup