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 16:12:15 +0200 Message-ID: <87mvpazsqo.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1459692771 2401 80.91.229.3 (3 Apr 2016 14:12:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Apr 2016 14:12:51 +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 16:12:42 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 1amile-0006S4-2R for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 16:12:42 +0200 Original-Received: from localhost ([::1]:53624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amild-0002qW-DN for ged-emacs-devel@m.gmane.org; Sun, 03 Apr 2016 10:12:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amilJ-0002pV-Ch for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:12:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amilG-00004y-7y for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:12:21 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:58831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amilG-00004t-1c for emacs-devel@gnu.org; Sun, 03 Apr 2016 10:12:18 -0400 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3qdHB85XN2z3hjNF; Sun, 3 Apr 2016 16:12:16 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3qdHB84vw3zvh25; Sun, 3 Apr 2016 16:12:16 +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 SX6TB8MFM2pE; Sun, 3 Apr 2016 16:12:15 +0200 (CEST) X-Auth-Info: 2s74cml77hq3kJ2Unh2xb7Matz6DLwAwQcdc8Guq+XQDTDebvW+oI2KlMLf7E/4+ 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 16:12:15 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 1000) id 6881E2C3440; Sun, 3 Apr 2016 16:12:15 +0200 (CEST) X-Yow: Is this an out-take from the ``BRADY BUNCH''? In-Reply-To: <87bn5qeuxo.fsf@acer.localhost.com> (Ingo Lohmar's message of "Sun, 03 Apr 2016 14:30:27 +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:202622 Archived-At: Ingo Lohmar writes: > Single caveat: Do NOT start a merge when you have uncommited changes. git merge will not allow overwriting uncommited changes anyway. 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."