From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Thu, 11 Jun 2015 05:46:19 +0300 Message-ID: <83r3pjrmh0.fsf@gnu.org> References: <83h9qlnx5a.fsf@gnu.org> <83lhfwmy4r.fsf@gnu.org> <6ovbevf2zb.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1433990841 10309 80.91.229.3 (11 Jun 2015 02:47:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 11 Jun 2015 02:47:21 +0000 (UTC) Cc: 20717@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 11 04:47:11 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1Z2sWM-0000Z7-Lk for geb-bug-gnu-emacs@m.gmane.org; Thu, 11 Jun 2015 04:47:10 +0200 Original-Received: from localhost ([::1]:43062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2sWM-0005FL-09 for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Jun 2015 22:47:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2sWI-0005F2-0p for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 22:47:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2sWE-0001Qs-MX for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 22:47:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2sWE-0001Qm-JK for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 22:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z2sWE-00040B-9k for bug-gnu-emacs@gnu.org; Wed, 10 Jun 2015 22:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Jun 2015 02:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20717 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20717-submit@debbugs.gnu.org id=B20717.143399079815349 (code B ref 20717); Thu, 11 Jun 2015 02:47:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 11 Jun 2015 02:46:38 +0000 Original-Received: from localhost ([127.0.0.1]:50011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2sVp-0003zV-9U for submit@debbugs.gnu.org; Wed, 10 Jun 2015 22:46:37 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:48008) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z2sVm-0003zC-RN for 20717@debbugs.gnu.org; Wed, 10 Jun 2015 22:46:36 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NPR00F00ECVM400@a-mtaout22.012.net.il> for 20717@debbugs.gnu.org; Thu, 11 Jun 2015 05:46:28 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NPR00F2GEDFM700@a-mtaout22.012.net.il>; Thu, 11 Jun 2015 05:46:28 +0300 (IDT) In-reply-to: <6ovbevf2zb.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:103811 Archived-At: > From: Glenn Morris > Cc: 20717@debbugs.gnu.org > Date: Wed, 10 Jun 2015 21:28:08 -0400 > > Eli Zaretskii wrote: > > > Do logs of changes made on feature branches also appear like that, and > > are also misplaced? E.g., what do you get there of the commits on the > > large-fonts branch I merged today? > > See > http://lists.gnu.org/archive/html/emacs-diffs/2015-06/msg00090.html > > The word "merge" isn't even mentioned in gitlog-to-changelog, and it's 7 > years old, so I assume no-one cares about such things. Frankly, it's not > much more than a dump of "git log" with some formatting tweaks to make > it look more like a ChangeLog. So should we manually correct the most glaring problems of the result of this? For example, the logs for commits I made on that branch should be deleted, as there's a summary log for the merge-commit later on that covers them all. Perhaps we should recommend that people use the ";" trick in the log messages they make on branches they intend to merge onto master later?