[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: |
Alan Mackenzie |
|
Subject: |
Re: In git, how does one revert a single file with merge conflicts in it? |
|
Date: |
Mon, 2 Feb 2015 19:29:49 +0000 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Evening, Andreas.
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?
> Have you tried reading the manual?
Many times, yes. Not often with much success.
> git-checkout(1)
Not even this one.
> Andreas.
> --
> Andreas Schwab, SUSE Labs, address@hidden
--
Alan Mackenzie (Nuremberg, Germany).
- In git, how does one revert a single file with merge conflicts in it?, Alan Mackenzie, 2015/02/02
- Re: In git, how does one revert a single file with merge conflicts in it?, Andreas Schwab, 2015/02/02
- Re: In git, how does one revert a single file with merge conflicts in it?,
Alan Mackenzie <=
- Re: In git, how does one revert a single file with merge conflicts in it?, Eli Zaretskii, 2015/02/02
- Re: In git, how does one revert a single file with merge conflicts in it?, Stefan Monnier, 2015/02/02