From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 15:11:15 +0200 Message-ID: <55213473.9000703@math.ntnu.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <55212DE9.8070806@math.ntnu.no> <83pp7in301.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428239634 17508 80.91.229.3 (5 Apr 2015 13:13:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 13:13:54 +0000 (UTC) Cc: eggert@cs.ucla.edu, rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 15:13:44 2015 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 1YekL1-0005It-7X for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 15:11:43 +0200 Original-Received: from localhost ([::1]:36452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekL0-0001Yq-C0 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 09:11:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekKm-0001Y3-1T for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:11:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YekKl-0008ME-37 for emacs-devel@gnu.org; Sun, 05 Apr 2015 09:11:27 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:34323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YekKg-0008Li-Jg; Sun, 05 Apr 2015 09:11:22 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 17218901301; Sun, 5 Apr 2015 15:11:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [10.0.0.106] (248.69.202.84.customer.cdi.no [84.202.69.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 1FF6E900F5F; Sun, 5 Apr 2015 15:11:17 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83pp7in301.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.225 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:184926 Archived-At: Eli Zaretskii wrote: >> Date: Sun, 05 Apr 2015 14:43:21 +0200 >> From: Harald Hanche-Olsen >> Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org >> >> The usual answer to this is to use development branches instead of >> workin directly in the master branch. I think it was decided not to >> recommend these for simple workflows, but I don't think it is that muc= h >> harder, and it is certainly easier than having separate repositories. > > It also requires to use at least one more command ("git merge"), Yup. However, you will not encounter any difficulties arising from this=20 that you do't already encounter with =E2=80=9Cgit pull=E2=80=9D. > and > brings additional risks, like if you pull to or push from the wrong > branch. But without extra configuration or explict arguments on the command=20 line, that is not going to happen: ; git checkout -b test Switched to a new branch 'test' ; git pull remote: Counting objects: 113, done. remote: Compressing objects: 100% (63/63), done. remote: Total 63 (delta 57), reused 0 (delta 0) Unpacking objects: 100% (63/63), done. From git://git.savannah.gnu.org/emacs fdc5219..bf81946 master -> origin/master There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details git pull If you wish to set tracking information for this branch you can do so wit= h: git branch --set-upstream-to=3Dorigin/ test ; git push fatal: The current branch test has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin test ; =E2=80=93 Harald