From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: [elpa]: I possibly broke something Date: Thu, 03 Dec 2015 21:20:43 +0100 Message-ID: <87io4fwag4.fsf@fencepost.gnu.org> References: <87r3j3whoz.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1449174071 21609 80.91.229.3 (3 Dec 2015 20:21:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Dec 2015 20:21:11 +0000 (UTC) Cc: David =?iso-8859-1?Q?Gonz=E1lez_G=E1ndara?= , emacs-devel To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 03 21:21:05 2015 Return-path: Envelope-to: ged-emacs-devel@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 1a4aNB-0001Oq-BU for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 21:21:01 +0100 Original-Received: from localhost ([::1]:37309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4aNA-0004YG-LB for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2015 15:21:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4aMx-0004YB-9S for emacs-devel@gnu.org; Thu, 03 Dec 2015 15:20:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4aMv-0000M7-UB for emacs-devel@gnu.org; Thu, 03 Dec 2015 15:20:46 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4aMu-0000L4-BY; Thu, 03 Dec 2015 15:20:44 -0500 Original-Received: from localhost ([127.0.0.1]:55339 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.82) (envelope-from ) id 1a4aMt-000898-Jf; Thu, 03 Dec 2015 15:20:43 -0500 Original-Received: by lola (Postfix, from userid 1000) id 43009E69F1; Thu, 3 Dec 2015 21:20:43 +0100 (CET) In-Reply-To: (Artur Malabarba's message of "Thu, 3 Dec 2015 20:13:02 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:195830 Archived-At: Artur Malabarba writes: > 2015-12-03 17:44 GMT+00:00 David Kastrup : >> How would you check using git-blame that he did not accidentally revert >> changes in a bad merge? Neither the old nor the new lines would be >> traced to him. > > I had already checked (and stated) earlier that he didn't revert > anything (with the diffs). Now I just checked whether he had "taken > ownership" of any previous changes (with blame). That's actually neigh impossible for a conflictless merge commit. git blame should not likely attribute anything to the committer of a merge but manually resolved merge conflicts. -- David Kastrup