From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Date: Mon, 08 Jun 2015 09:52:53 -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 1433771616 6158 80.91.229.3 (8 Jun 2015 13:53:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 8 Jun 2015 13:53:36 +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 Mon Jun 08 15:53:19 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 1Z1xUN-0004ay-4Q for geb-bug-gnu-emacs@m.gmane.org; Mon, 08 Jun 2015 15:53:19 +0200 Original-Received: from localhost ([::1]:58125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1xUH-0003Ae-GU for geb-bug-gnu-emacs@m.gmane.org; Mon, 08 Jun 2015 09:53:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1xUC-0003AR-GI for bug-gnu-emacs@gnu.org; Mon, 08 Jun 2015 09:53:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1xU7-0004mo-01 for bug-gnu-emacs@gnu.org; Mon, 08 Jun 2015 09:53:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1xU6-0004me-Sj for bug-gnu-emacs@gnu.org; Mon, 08 Jun 2015 09:53:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z1xU6-0004VO-Gc for bug-gnu-emacs@gnu.org; Mon, 08 Jun 2015 09:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 08 Jun 2015 13:53: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.143377157617306 (code B ref 20717); Mon, 08 Jun 2015 13:53:02 +0000 Original-Received: (at 20717) by debbugs.gnu.org; 8 Jun 2015 13:52:56 +0000 Original-Received: from localhost ([127.0.0.1]:44872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1xU0-0004V4-D3 for submit@debbugs.gnu.org; Mon, 08 Jun 2015 09:52:56 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:58221) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z1xTz-0004Uw-0B for 20717@debbugs.gnu.org; Mon, 08 Jun 2015 09:52:55 -0400 Original-Received: from fmsmemgm.homelinux.net (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t58DqrXe006020; Mon, 8 Jun 2015 09:52:53 -0400 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 66C6DAE13F; Mon, 8 Jun 2015 09:52:53 -0400 (EDT) In-Reply-To: <83h9qlnx5a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 09:55:45 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5331=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5331> : inlines <3172> : streams <1452064> : uri <1952827> 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:103745 Archived-At: > For commits on "mainline", you can use "git log --first-parent" to > show only mainline commits, but this will not help you in the case in > point. Not only that: it will not always show you what you wanted to see, since it's much too easy to make a commit where the first parent is not the previous revision on the trunk but the previous revision in your own local branch instead (and much too hard to avoid this situation). Stefan