[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 16:02:56 +0300 |
> Date: Sun, 05 Apr 2015 14:54:59 +0200
> From: Harald Hanche-Olsen <address@hidden>
> CC: address@hidden, address@hidden, address@hidden,
> address@hidden
>
> > I suggest to unstash them, fix the conflict in lisp/ChangeLog, and
> > then commit all of that. Then you should be in sync with upstream and
> > can pull again.
>
> Yes. At risk of repeating myself: After committing, run
>
> git diff origin/master
>
> which should give you exactly the changes you have written, no more, no
> less. Don't push unless the output looks sane.
Meanwhile is looks like at least some of those changes were already
pushed, as I see them on master. So I'm no longer sure what is the
current status of Richard's local repository.
- Re: VC mode and git, (continued)
- 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, 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 <=
- 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, Dmitry Gutov, 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, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/03