[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Stephen J. Turnbull |
Subject: |
Re: VC mode and git |
Date: |
Sun, 05 Apr 2015 08:17:29 +0900 |
Steinar Bang writes:
> > IIUC git's pull is not atomic. When the merge fails with a message like
> > the above I have no idea in what state my copy of a repository is in.
>
> It is in the same state it was as before you did the pull.
No, in the repo origin/master has been updated. It's true that master
has not been updated and the working tree is untouched. Of course
this difference is probably not apparent to most users.
- Re: VC mode and git, (continued)
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, martin rudalics, 2015/04/06
- Re: VC mode and git, Eli Zaretskii, 2015/04/07
- Re: VC mode and git, martin rudalics, 2015/04/08
- Re: VC mode and git, Eli Zaretskii, 2015/04/08
- Re: VC mode and git, Steinar Bang, 2015/04/04
- Re: VC mode and git,
Stephen J. Turnbull <=
- Re: VC mode and git, Steinar Bang, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05