From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2] Date: Sun, 03 Apr 2016 17:08:51 +0200 Message-ID: <87a8lazq4c.fsf@linux-m68k.org> References: <20160403111708.GA3537@acm.fritz.box> <87lh4uex9h.fsf@acer.localhost.com> <20160403121458.GC3537@acm.fritz.box> <87bn5qeuxo.fsf@acer.localhost.com> <87mvpazsqo.fsf@linux-m68k.org> <878u0ueo3x.fsf@acer.localhost.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459696162 19204 80.91.229.3 (3 Apr 2016 15:09:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 15:09:22 +0000 (UTC) Cc: Alan Mackenzie , Kaushal Modi , Emacs developers To: Ingo Lohmar Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 03 17:09:13 2016 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 1amjeJ-00065T-Er for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 17:09:11 +0200 Original-Received: from localhost ([::1]:53831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amjeI-0001MN-Cm for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 11:09:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amje4-0001MF-Ue for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:08:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amje1-0003b0-Od for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:08:56 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:56978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amje1-0003at-IK for emacs-devel@gnu.org; Sun, 03 Apr 2016 11:08:53 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qdJRS2D4Zz3hj8L; Sun, 3 Apr 2016 17:08:52 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qdJRS1jspzvh1v; Sun, 3 Apr 2016 17:08:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id rKqJi21anv1J; Sun, 3 Apr 2016 17:08:51 +0200 (CEST) X-Auth-Info: 13LSXXwIYG9z9dAMo13fnCFYjtEn7+AyP/QByjN8JqpWaq2y3tQgdtZ+1QosyS1H Original-Received: from igel.home (ppp-88-217-22-197.dynamic.mnet-online.de [88.217.22.197]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 3 Apr 2016 17:08:51 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 1DF662C373A; Sun, 3 Apr 2016 17:08:51 +0200 (CEST) X-Yow: TAPPING? You POLITICIANS! Don't you realize that the END of the ``Wash Cycle'' is a TREASURED MOMENT for most people?! In-Reply-To: <878u0ueo3x.fsf@acer.localhost.com> (Ingo Lohmar's message of "Sun, 03 Apr 2016 16:57:54 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.92 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:202630 Archived-At: Ingo Lohmar writes: > That's correct, but if the changes are in files unaffected by the merge, > git *does* start the merge. But it will be hard to return to the exact > pre-merge state if you want to abort. git merge --abort will do. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."