From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Andreas Schwab <schwab@suse.de>
Newsgroups: gmane.emacs.devel
Subject: Re: In git,
	how does one revert a single file with merge conflicts in it?
Date: Tue, 03 Feb 2015 10:04:41 +0100
Message-ID: <mvm8ugfgyc6.fsf@hawking.suse.de>
References: <20150202120003.GA3673@acm.acm> <mvmk300h2hz.fsf@hawking.suse.de>
	<20150202192949.GC3673@acm.acm>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: ger.gmane.org 1422954304 20545 80.91.229.3 (3 Feb 2015 09:05:04 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 3 Feb 2015 09:05:04 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Alan Mackenzie <acm@muc.de>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 03 10:05:03 2015
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1YIZPo-0003Tm-Ok
	for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 10:05:00 +0100
Original-Received: from localhost ([::1]:58285 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1YIZPi-0004YH-Og
	for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 04:04:54 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58999)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwab@suse.de>) id 1YIZPf-0004YA-0C
	for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:04:51 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <schwab@suse.de>) id 1YIZPX-0002ES-Nk
	for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:04:49 -0500
Original-Received: from cantor2.suse.de ([195.135.220.15]:60841 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwab@suse.de>) id 1YIZPX-0002EC-HH
	for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:04:43 -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 6197DACA9;
	Tue,  3 Feb 2015 09:04:42 +0000 (UTC)
X-Yow: I'm also pre-POURED pre-MEDITATED and pre-RAPHAELITE!!
In-Reply-To: <20150202192949.GC3673@acm.acm> (Alan Mackenzie's message of
	"Mon, 2 Feb 2015 19:29:49 +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." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:182313
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/182313>

Your case is explicitly and elaborately handled in the manual.

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."