Re: VC mode and git

[Eli Zaretskii]

> 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.