From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 15:45:47 +0200 Message-ID: <83ppcfs60k.fsf@gnu.org> References: <871toysqyq.fsf@rosalinde.fritz.box> <838uj57u5b.fsf@gnu.org> <87ppchd9dk.fsf@Gertrud.fritz.box> <83fvdd612c.fsf@gnu.org> <87h9xttmwa.fsf@uwakimon.sk.tsukuba.ac.jp> <83oas13p1y.fsf@gnu.org> <87egsvu7iw.fsf@uwakimon.sk.tsukuba.ac.jp> <837fyntyy9.fsf@gnu.org> <87vbm7shjx.fsf@uwakimon.sk.tsukuba.ac.jp> <83389bttv8.fsf@gnu.org> <871tov4gki.fsf@igel.home> <83sihbs95r.fsf@gnu.org> <87wq6n2xw9.fsf@igel.home> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416663976 20949 80.91.229.3 (22 Nov 2014 13:46:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 13:46:16 +0000 (UTC) Cc: stephen@xemacs.org, Stromeko@nexgo.de, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 14:46:09 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XsB0n-000652-J6 for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 14:46:05 +0100 Original-Received: from localhost ([::1]:45494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsB0n-0007cU-3o for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 08:46:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsB0X-0007cJ-5d for emacs-devel@gnu.org; Sat, 22 Nov 2014 08:45:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsB0S-0001Bz-Jg for emacs-devel@gnu.org; Sat, 22 Nov 2014 08:45:49 -0500 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:35379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsB0S-0001Bo-AQ for emacs-devel@gnu.org; Sat, 22 Nov 2014 08:45:44 -0500 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NFG009000MLNU00@mtaout25.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 15:41:20 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFG007W40OWT710@mtaout25.012.net.il>; Sat, 22 Nov 2014 15:41:20 +0200 (IST) In-reply-to: <87wq6n2xw9.fsf@igel.home> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178006 Archived-At: > From: Andreas Schwab > Cc: stephen@xemacs.org, Stromeko@nexgo.de, emacs-devel@gnu.org > Date: Sat, 22 Nov 2014 14:00:22 +0100 > > Eli Zaretskii 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?