From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Stupid git! Date: Mon, 14 Sep 2015 10:21:58 +0000 Message-ID: <20150914102158.GA3208@acm.fritz.box> References: <20150912101514.GA2322@acm.fritz.box> <877fnvn9nh.fsf@foo.bar.baz> <20150912130255.GF2322@acm.fritz.box> <83egi3brbw.fsf@gnu.org> <20150912203658.GA3711@acm.fritz.box> <55F48E7F.40602@yandex.ru> <20150912215114.GB3711@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1442226076 4957 80.91.229.3 (14 Sep 2015 10:21:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Sep 2015 10:21:16 +0000 (UTC) Cc: emacs To: Sven Axelsson Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Sep 14 12:21:07 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 1ZbQsh-0007s3-FS for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 12:21:03 +0200 Original-Received: from localhost ([::1]:39589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQsh-0004Lh-2I for ged-emacs-devel@m.gmane.org; Mon, 14 Sep 2015 06:21:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQsT-00047d-KJ for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:20:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbQsP-0004GK-L6 for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:20:49 -0400 Original-Received: from mail.muc.de ([193.149.48.3]:52784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbQsP-0004Fd-CN for emacs-devel@gnu.org; Mon, 14 Sep 2015 06:20:45 -0400 Original-Received: (qmail 74605 invoked by uid 3782); 14 Sep 2015 10:20:43 -0000 Original-Received: from acm.muc.de (p579E9E99.dip0.t-ipconnect.de [87.158.158.153]) by colin.muc.de (tmda-ofmipd) with ESMTP; Mon, 14 Sep 2015 12:20:42 +0200 Original-Received: (qmail 3506 invoked by uid 1000); 14 Sep 2015 10:21:58 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 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:189929 Archived-At: Hello, Sven. On Sun, Sep 13, 2015 at 08:22:26AM +0200, Sven Axelsson wrote: > `git status` tells you if you are in a merge operation, as you can > see from the message above. To back out and undo all changes > introduced by the merge, you can use `git merge --abort`. Thanks! I'll note that down in case I even need it in the future. > -- > Sven Axelsson > ++++++++++[>++++++++++>+++++++++++>++++++++++>++++++ > >++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<. > +++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----. -- Alan Mackenzie (Nuremberg, Germany).