From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: git commit/push and VC Date: Sat, 22 Nov 2014 14:00:22 +0100 Message-ID: <87wq6n2xw9.fsf@igel.home> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416661262 16546 80.91.229.3 (22 Nov 2014 13:01:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 13:01:02 +0000 (UTC) Cc: stephen@xemacs.org, Stromeko@nexgo.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 22 14:00:55 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 1XsAJ3-0001Gw-AK for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 14:00:53 +0100 Original-Received: from localhost ([::1]:45368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsAJ2-00014l-Sr for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 08:00:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsAIu-00014R-Oy for emacs-devel@gnu.org; Sat, 22 Nov 2014 08:00:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsAIp-0006fY-6W for emacs-devel@gnu.org; Sat, 22 Nov 2014 08:00:44 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:41584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsAIf-0006ec-E3; Sat, 22 Nov 2014 08:00:29 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3jlF9413HPz3hjQX; Sat, 22 Nov 2014 14:00:23 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3jlF936ZJ2zvh1s; Sat, 22 Nov 2014 14:00:23 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 17LEPAtsinin; Sat, 22 Nov 2014 14:00:23 +0100 (CET) X-Auth-Info: bcdocvoaFLbM3zEM0k4FhOPZzX47F+LMYnM8CtNMh0NV3UCWmGOL9NVTXlmMcol0 Original-Received: from igel.home (ppp-188-174-148-213.dynamic.mnet-online.de [188.174.148.213]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 22 Nov 2014 14:00:23 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id DD5582C4441; Sat, 22 Nov 2014 14:00:22 +0100 (CET) X-Yow: This is PLEASANT! In-Reply-To: <83sihbs95r.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 22 Nov 2014 14:37:52 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:178002 Archived-At: 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. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."