[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Eli Zaretskii |
Subject: |
Re: VC mode and git |
Date: |
Sun, 05 Apr 2015 15:58:05 +0300 |
> Date: Sun, 05 Apr 2015 11:55:24 +0200
> From: Harald Hanche-Olsen <address@hidden>
> CC: "Stephen J. Turnbull" <address@hidden>, address@hidden,
> address@hidden
>
> Eli Zaretskii wrote:
> > Yes, something like that. In fact, I think the root cause of the
> > original problem was that "C-x v v", which tried to commit a single
> > file in the middle of a merge. Instead, the correct action is either
> > 'v' from vc-dir or "git commit" from the shell prompt.
> >
> > It would be good if "C-x v v" tried to support this situation better.
> > I hope Eric Raymond is reading this.
>
> You need to detect the fact that a merge is underway. Is the existence
> of .git/MERGE_HEAD a reliable indicator of this?
I think so, but I hope some Git expert will answer that.
- Re: VC mode and git, (continued)
- 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
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05