[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: |
Fri, 03 Apr 2015 14:33:13 +0300 |
> From: Steinar Bang <address@hidden>
> Date: Fri, 03 Apr 2015 11:22:36 +0200
>
> >>>>> Eli Zaretskii <address@hidden>:
>
> > So why would Richard need to use "stash" in this situation? It sounds
> > like an unnecessary complication.
>
> No, you're right. Keep it simple, no stash or rebase in the examples.
>
> To commit:
> git commit
> git push
>
> If push fails:
> git pull
> git push
>
> If pull fails with conflicts, fix the conflict markers like in CVS, then
> git commit
> git push
Thanks.
- Re: VC mode and git, (continued)
- Re: VC mode and git, Richard Stallman, 2015/04/01
- Re: VC mode and git, Andreas Schwab, 2015/04/01
- Re: VC mode and git, Richard Stallman, 2015/04/02
- Re: VC mode and git, Steinar Bang, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Steinar Bang, 2015/04/03
- Re: VC mode and git,
Eli Zaretskii <=
Re: VC mode and git, Eli Zaretskii, 2015/04/01
- Re: VC mode and git, Robert Pluim, 2015/04/01
- Re: VC mode and git, Eli Zaretskii, 2015/04/01
- Re: VC mode and git, Robert Pluim, 2015/04/02
- Re: VC mode and git, Eli Zaretskii, 2015/04/02
- Re: VC mode and git, Robert Pluim, 2015/04/02
- 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, Richard Stallman, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04