[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: |
Tue, 31 Mar 2015 14:51:41 +0300 |
> From: Mike Gerwitz <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden, address@hidden,
> address@hidden
> Date: Tue, 31 Mar 2015 01:12:47 -0400
>
> > We decided some time ago that we don't want to rebase, but to pull
> > instead.
>
> It is a pull---`git pull` is simply `git fetch && git merge remote`; its
> - --rebase option uses `rebase` instead of `merge`.
Yes, and that's exactly what we decided to avoid, because it has bad
effects if one merges from another branch and then wants to push.
- Re: VC mode and git, (continued)
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Richard Stallman, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Mike Gerwitz, 2015/03/31
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, Dmitry Gutov, 2015/03/27
- Re: VC mode and git, Eli Zaretskii, 2015/03/27
- Re: VC mode and git, Dmitry Gutov, 2015/03/27
- Re: VC mode and git, Eli Zaretskii, 2015/03/27
- Re: VC mode and git, Dmitry Gutov, 2015/03/27
- Re: VC mode and git, Eli Zaretskii, 2015/03/27
- Re: VC mode and git, Dmitry Gutov, 2015/03/27
- Re: VC mode and git, Eli Zaretskii, 2015/03/27
- Re: VC mode and git, Richard Stallman, 2015/03/28
- Re: VC mode and git, Sven Axelsson, 2015/03/27