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: In git, how does one revert a single file with merge conflicts in it? Date: Mon, 2 Feb 2015 19:29:49 +0000 Message-ID: <20150202192949.GC3673@acm.acm> References: <20150202120003.GA3673@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1422905439 21392 80.91.229.3 (2 Feb 2015 19:30:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 19:30:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 20:30:38 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 1YIMhf-0002cr-Ky for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 20:30:35 +0100 Original-Received: from localhost ([::1]:56154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMhe-0004sx-AA for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 14:30:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMhW-0004sZ-Ll for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:30:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIMhT-0003Cd-5R for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:30:26 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:44445 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIMhS-0003CN-TB for emacs-devel@gnu.org; Mon, 02 Feb 2015 14:30:23 -0500 Original-Received: (qmail 93950 invoked by uid 3782); 2 Feb 2015 19:30:22 -0000 Original-Received: from acm.muc.de (pD951BC19.dip0.t-ipconnect.de [217.81.188.25]) by colin.muc.de (tmda-ofmipd) with ESMTP; Mon, 02 Feb 2015 20:30:21 +0100 Original-Received: (qmail 11135 invoked by uid 1000); 2 Feb 2015 19:29:49 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:182286 Archived-At: Evening, Andreas. On Mon, Feb 02, 2015 at 02:22:32PM +0100, Andreas Schwab wrote: > Alan Mackenzie writes: > > How do I revert a file in git? > Have you tried reading the manual? Many times, yes. Not often with much success. > git-checkout(1) Not even this one. > Andreas. > -- > Andreas Schwab, SUSE Labs, schwab@suse.de -- Alan Mackenzie (Nuremberg, Germany).