emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: In git, how does one revert a single file with merge conflicts in it


From: Steinar Bang
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
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

> On Mon, Feb 02, 2015 at 02:22:32PM +0100, Andreas Schwab wrote:
>> Alan Mackenzie <address@hidden> 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.

















reply via email to

[Prev in Thread] Current Thread [Next in Thread]