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: In git, how does one revert a single file with merge conflicts in it? Date: Mon, 02 Feb 2015 14:22:32 +0100 Message-ID: References: <20150202120003.GA3673@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422883381 25590 80.91.229.3 (2 Feb 2015 13:23:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 2 Feb 2015 13:23:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 02 14:22:57 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 1YIGxs-0000fV-F7 for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 14:22:56 +0100 Original-Received: from localhost ([::1]:54627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIGxm-0007DW-Oh for ged-emacs-devel@m.gmane.org; Mon, 02 Feb 2015 08:22:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIGxa-0007DO-Ha for emacs-devel@gnu.org; Mon, 02 Feb 2015 08:22:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIGxW-0004Xq-HE for emacs-devel@gnu.org; Mon, 02 Feb 2015 08:22:38 -0500 Original-Received: from cantor2.suse.de ([195.135.220.15]:46381 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIGxW-0004Xc-Ay for emacs-devel@gnu.org; Mon, 02 Feb 2015 08:22:34 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F4067ACBE; Mon, 2 Feb 2015 13:22:32 +0000 (UTC) X-Yow: World War Three can be averted by adherence to a strictly enforced dress code! In-Reply-To: <20150202120003.GA3673@acm.acm> (Alan Mackenzie's message of "Mon, 2 Feb 2015 12:00:03 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:182250 Archived-At: Alan Mackenzie writes: > How do I revert a file in git? Have you tried reading the manual? git-checkout(1) Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."