From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup 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:26:38 +0100 Message-ID: <87sien2vn5.fsf@fencepost.gnu.org> References: <20150202120003.GA3673@acm.acm> <20150202192949.GC3673@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422955620 10306 80.91.229.3 (3 Feb 2015 09:27:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Feb 2015 09:27:00 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 03 10:27:00 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 1YIZl4-0005RM-P7 for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 10:26:58 +0100 Original-Received: from localhost ([::1]:58358 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIZl4-00014G-4W for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 04:26:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIZl1-00013t-AP for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:26:56 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIZky-0001Xa-JY for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:26:55 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIZky-0001XW-Gl for emacs-devel@gnu.org; Tue, 03 Feb 2015 04:26:52 -0500 Original-Received: from localhost ([127.0.0.1]:47571 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIZkx-0001AD-AP; Tue, 03 Feb 2015 04:26:51 -0500 Original-Received: by lola (Postfix, from userid 1000) id F3EA2E062D; Tue, 3 Feb 2015 10:26:38 +0100 (CET) In-Reply-To: (Andreas Schwab's message of "Tue, 03 Feb 2015 10:04:41 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:182314 Archived-At: Andreas Schwab writes: > Your case is explicitly and elaborately handled in the manual. Man, time really flies. It seems like the finals for "least helpful answer on a mailing list" are coming up again. How about replacing "the manual" with "somewhere"? It's almost as specific but more ominous. > Andreas. You don't say. -- David Kastrup