emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git commit/push and VC


From: Andreas Schwab
Subject: Re: git commit/push and VC
Date: Sat, 22 Nov 2014 14:00:22 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)

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.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]