From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: CEDET Merge Date: Fri, 20 Jan 2017 17:40:45 -0500 Message-ID: References: <87r348ul9n.fsf@gmail.com> <87lgugm2qg.fsf@gmail.com> <87inpelu8i.fsf@gmail.com> <837f5uajlk.fsf@gnu.org> <87a8aqlqz8.fsf@gmail.com> <8360leahxr.fsf@gnu.org> <8760lelq68.fsf@gmail.com> <83wpdt8yo2.fsf@gnu.org> <87inpd650y.fsf@gmail.com> <8660ldabje.fsf@stephe-leake.org> <8737gh5sqw.fsf@gmail.com> <87k29tv0r4.fsf@engster.org> <8737gguipm.fsf@engster.org> <87h94vdj3n.fsf@gmail.com> <87o9z2sog1.fsf@engster.org> <87vataadkk.fsf@red-bean.com> <87k29ps7ai.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1484952114 25232 195.159.176.226 (20 Jan 2017 22:41:54 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 20 Jan 2017 22:41:54 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 20 23:41:50 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUhsU-0006EX-Ao for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 23:41:50 +0100 Original-Received: from localhost ([::1]:57663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUhsZ-0007KU-Dz for ged-emacs-devel@m.gmane.org; Fri, 20 Jan 2017 17:41:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUhri-0007Ji-FY for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:41:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUhrf-00040F-Dl for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:41:02 -0500 Original-Received: from [195.159.176.226] (port=34040 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUhrf-0003za-7R for emacs-devel@gnu.org; Fri, 20 Jan 2017 17:40:59 -0500 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1cUhrV-0001GN-1K for emacs-devel@gnu.org; Fri, 20 Jan 2017 23:40:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 11 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:TjKx2zgqzF0A2tqYiZBtv6k5cqc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:211446 Archived-At: > Yes, 'git am' does that automatically. However, I always followed the > general rule that the generated ChangeLogs should have the date when the > change enters the Emacs repository, so I'm not sure if I should even > retain the original date? AFAIK, Git records the "author date" separately from the "commit date", so The Right Thing To Do is to use the fancy --date argument to provide the "author date". The ChangeLog can use the "commit date" if needed. Stefan