From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang 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 23:36:55 +0100 Organization: Probably a good idea Message-ID: <86bnla4o6w.fsf@dod.no> 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 1423003041 6270 80.91.229.3 (3 Feb 2015 22:37:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Feb 2015 22:37:21 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 03 23:37:17 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 1YIm5t-0005t6-3q for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 23:37:17 +0100 Original-Received: from localhost ([::1]:33711 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIm5s-0006W2-KD for ged-emacs-devel@m.gmane.org; Tue, 03 Feb 2015 17:37:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIm5b-0006Sy-2L for emacs-devel@gnu.org; Tue, 03 Feb 2015 17:36:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIm5X-0003De-TL for emacs-devel@gnu.org; Tue, 03 Feb 2015 17:36:58 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:49864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIm5X-0003DY-M7 for emacs-devel@gnu.org; Tue, 03 Feb 2015 17:36:55 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YIm5R-0005j9-I0 for emacs-devel@gnu.org; Tue, 03 Feb 2015 23:36:49 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Feb 2015 23:36:49 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Feb 2015 23:36:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:c4KKHUT202Y5rDHWA+vBFQ1bbo0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:182347 Archived-At: > On Mon, Feb 02, 2015 at 02:22:32PM +0100, Andreas Schwab wrote: >> Alan Mackenzie writes: >> > How do I revert a file in git? >> git-checkout(1) git checkout sha1 path/to/file In place of sha1 you could put a tag or a branch name.