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: Sat, 06 Jun 2015 14:13:38 -0400 Message-ID: References: <83h9qlnx5a.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1433614457 4114 80.91.229.3 (6 Jun 2015 18:14:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jun 2015 18:14:17 +0000 (UTC) Cc: 20717@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 06 20:14:08 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 1Z1Ibg-0005x1-5x for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 20:14:08 +0200 Original-Received: from localhost ([::1]:52253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Ibf-00078x-Gw for geb-bug-gnu-emacs@m.gmane.org; Sat, 06 Jun 2015 14:14:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Ibc-00078q-62 for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:14:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1Ibb-00042g-53 for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:14:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Ibb-00042c-21 for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:14:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z1Iba-0005Hl-Lb for bug-gnu-emacs@gnu.org; Sat, 06 Jun 2015 14:14: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: Sat, 06 Jun 2015 18:14: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.143361442020281 (code B ref 20717); Sat, 06 Jun 2015 18:14:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 6 Jun 2015 18:13:40 +0000 Original-Received: from localhost ([127.0.0.1]:43435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1IbE-0005H2-2p for submit@debbugs.gnu.org; Sat, 06 Jun 2015 14:13:40 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:57069 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1IbC-0005Gv-Pf for 20717@debbugs.gnu.org; Sat, 06 Jun 2015 14:13:39 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Z1IbC-0004Kl-AM; Sat, 06 Jun 2015 14:13:38 -0400 X-Spook: PLO Plague Hacker Forest fire keyhole Brute forcing X-Ran: mbUQ05@Dj'G^}ZR$!JyUE1>bfB:jNs-#_9bEAK2Hm;9/nE7(m}(o:9RoH+\MXwG~E2s$&f X-Hue: black X-Attribution: GM In-Reply-To: <83h9qlnx5a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 09:55:45 +0300") 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:103665 Archived-At: Eli Zaretskii wrote: > I'm guessing that you are using "git log" to show this. No, I'm using `make ChangeLog' like I said in the original message. This produces a ChangeLog which is a confusing mess where merges are involved.