From: Andreas Schwab <schwab@suse.de>
To: Alan Mackenzie <acm@muc.de>
Cc: emacs-devel@gnu.org
Subject: Re: In git, how does one revert a single file with merge conflicts in it?
Date: Mon, 02 Feb 2015 14:22:32 +0100 [thread overview]
Message-ID: <mvmk300h2hz.fsf@hawking.suse.de> (raw)
In-Reply-To: <20150202120003.GA3673@acm.acm> (Alan Mackenzie's message of "Mon, 2 Feb 2015 12:00:03 +0000")
Alan Mackenzie <acm@muc.de> writes:
> How do I revert a file in git?
Have you tried reading the manual?
git-checkout(1)
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."
next prev parent reply other threads:[~2015-02-02 13:22 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mvmk300h2hz.fsf@hawking.suse.de \
--to=schwab@suse.de \
--cc=acm@muc.de \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.