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 14:37:52 +0200 Message-ID: <83sihbs95r.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416659907 30528 80.91.229.3 (22 Nov 2014 12:38:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 22 Nov 2014 12:38:27 +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 13:38:20 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 1Xs9xC-0002ZE-7a for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 13:38:18 +0100 Original-Received: from localhost ([::1]:45173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs9xB-0006Z6-Rw for ged-emacs-devel@m.gmane.org; Sat, 22 Nov 2014 07:38:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs9wo-0006Ok-KY for emacs-devel@gnu.org; Sat, 22 Nov 2014 07:37:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xs9wk-0000Sc-0p for emacs-devel@gnu.org; Sat, 22 Nov 2014 07:37:54 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:43987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xs9wj-0000SW-P9 for emacs-devel@gnu.org; Sat, 22 Nov 2014 07:37:49 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NFF00700WJ3NZ00@mtaout24.012.net.il> for emacs-devel@gnu.org; Sat, 22 Nov 2014 14:30:09 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFF006BMXE96Z40@mtaout24.012.net.il>; Sat, 22 Nov 2014 14:30:09 +0200 (IST) In-reply-to: <871tov4gki.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.180 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:178001 Archived-At: > From: Andreas Schwab > Cc: "Stephen J. Turnbull" , Stromeko@nexgo.de, emacs-devel@gnu.org > Date: Sat, 22 Nov 2014 12:31:41 +0100 > > Eli Zaretskii writes: > > >> I think just "git pull -e ../emacs-24" and edit the commit message is > >> clearer, instead of pull and merging. > > > > I don't think we need the "../" part, do we? It's the same > > repository, and emacs-24 is the name of a branch, not a directory. > > You don't pull from a branch, you pull from a repository. That's the > operation that copies objects from one repository to another. Ah, okay, thanks. 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 # fix conflicts, if any # run tests, fix bugs git commit -a git push Am I missing something in this sequence?