From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
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 [thread overview]
Message-ID: <86bnla4o6w.fsf@dod.no> (raw)
In-Reply-To: 20150202192949.GC3673@acm.acm
> On Mon, Feb 02, 2015 at 02:22:32PM +0100, Andreas Schwab wrote:
>> Alan Mackenzie <acm@muc.de> 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.
next prev parent reply other threads:[~2015-02-03 22:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-02 12:00 In git, how does one revert a single file with merge conflicts in it? Alan Mackenzie
2015-02-02 13:22 ` Andreas Schwab
2015-02-02 19:29 ` Alan Mackenzie
2015-02-03 9:04 ` Andreas Schwab
2015-02-03 9:26 ` David Kastrup
2015-02-03 22:36 ` Steinar Bang [this message]
2015-02-02 16:05 ` Eli Zaretskii
2015-02-02 19:32 ` Alan Mackenzie
2015-02-02 17:40 ` Stefan Monnier
2015-02-02 19:37 ` Alan Mackenzie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86bnla4o6w.fsf@dod.no \
--to=sb@dod.no \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).