Re: git commit/push and VC

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: address@hidden,  address@hidden,  address@hidden
> Date: Sat, 22 Nov 2014 14:00:22 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> > However, I was asking about merging from the release branch in the
> > same repository, just without checking out the release branch in that
> > repository, ever.  In that case, I think this will do (assuming
> > 'master' is checked out):
> >
> >   git pull
> >   git merge emacs-24
> 
> You want to merge the remote-tracking branch origin/emacs-24.  That's
> what git pull (or rather git fetch) will update.

Thanks.  Just to be sure, the correct merge command should be

  git merge remotes/origin/emacs-24

is that right?