From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Tue, 02 Jun 2015 02:22:10 -0400 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1433226205 24452 80.91.229.3 (2 Jun 2015 06:23:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Jun 2015 06:23:25 +0000 (UTC) To: 20717@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 02 08:23:17 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 1YzfbQ-0003F3-DL for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jun 2015 08:23:08 +0200 Original-Received: from localhost ([::1]:56292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzfbP-0007XK-F2 for geb-bug-gnu-emacs@m.gmane.org; Tue, 02 Jun 2015 02:23:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzfbL-0007XE-Pj for bug-gnu-emacs@gnu.org; Tue, 02 Jun 2015 02:23:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzfbK-0002Oj-T8 for bug-gnu-emacs@gnu.org; Tue, 02 Jun 2015 02:23:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzfbK-0002Oc-PE for bug-gnu-emacs@gnu.org; Tue, 02 Jun 2015 02:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YzfbK-0008MK-EV for bug-gnu-emacs@gnu.org; Tue, 02 Jun 2015 02:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 02 Jun 2015 06:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20717 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.143322613432024 (code B ref -1); Tue, 02 Jun 2015 06:23:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Jun 2015 06:22:14 +0000 Original-Received: from localhost ([127.0.0.1]:36753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfaY-0008KS-H7 for submit@debbugs.gnu.org; Tue, 02 Jun 2015 02:22:14 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:44474 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YzfaW-0008KI-5G for submit@debbugs.gnu.org; Tue, 02 Jun 2015 02:22:12 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YzfaU-0000ys-FX; Tue, 02 Jun 2015 02:22:10 -0400 X-Spook: morse CDMA AIEWS Saddam Hussein Telex kilderkin Attorney X-Ran: fsG)1{i>y@|xk;[Ta0|Bv!~8g4JB/C--@wULX.kS}9r^8kw46VG8PXjor2cgpAM#aN\*-I X-Hue: red X-Attribution: GM User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:103465 Archived-At: Package: emacs Version: 25.0.50 After using M-x gitmerge (which seems v nice, BTW), 'make ChangeLog' creates a file with contents: 2015-06-01 Glenn Morris Merge from origin/emacs-24 8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual. The merged entries should be listed under the name of the original author(s), not the name of the person who did the merge.