From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Wed, 09 Jan 2008 04:50:05 +0900 Message-ID: <874pdom70y.fsf@catnip.gol.com> References: <20080101171120.GC3830@muc.de> <20080101.190535.32709273.wl@gnu.org> <20080101182742.GE3830@muc.de> <20080101.192802.05328072.wl@gnu.org> <20080103010807.GB13318@kobe.laptop> <85wsqqnfce.fsf@lola.goethe.zz> <85bq80mgut.fsf@lola.goethe.zz> <85fxxbjjk2.fsf@lola.goethe.zz> <874pdqqkq4.fsf@workhorse.earlhome> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1199821832 31292 80.91.229.12 (8 Jan 2008 19:50:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Jan 2008 19:50:32 +0000 (UTC) Cc: Gregory Collins , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 08 20:50:53 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JCKTM-00032h-0d for ged-emacs-devel@m.gmane.org; Tue, 08 Jan 2008 20:50:53 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JCKSy-0003BQ-EN for ged-emacs-devel@m.gmane.org; Tue, 08 Jan 2008 14:50:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JCKSs-000399-MV for emacs-devel@gnu.org; Tue, 08 Jan 2008 14:50:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JCKSr-00036V-14 for emacs-devel@gnu.org; Tue, 08 Jan 2008 14:50:22 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JCKSq-00036K-SY for emacs-devel@gnu.org; Tue, 08 Jan 2008 14:50:20 -0500 Original-Received: from smtp02.dentaku.gol.com ([203.216.5.72]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JCKSh-0006BL-5b; Tue, 08 Jan 2008 14:50:11 -0500 Original-Received: from 203-216-100-219.dsl.gol.ne.jp ([203.216.100.219] helo=catnip.gol.com) by smtp02.dentaku.gol.com with esmtpa (Dentaku) id 1JCKSc-0006O2-N6; Wed, 09 Jan 2008 04:50:06 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 9414B2FF7; Wed, 9 Jan 2008 04:50:05 +0900 (JST) System-Type: i686-pc-linux-gnu In-Reply-To: (Richard Stallman's message of "Tue, 08 Jan 2008 14:07:33 -0500") Original-Lines: 44 X-Abuse-Complaints: abuse@gol.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:86581 Archived-At: Richard Stallman writes: > The URL identifies the repository. When you do a "pull", you obtain the > _set_ of all revisions that exist on the remote but don't exist in your > local tree (remember that in a distributed context every repository has > a complete history). > > What command do you use to get "the current development version" > sources out of that local copy of the repository? [The following is about git] When you originally create a working directory + local-repository (the "local repository" is in the WD's ".git" subdirectory), you use the "clone" command: git clone git://git.sv.gnu.org/emacs.git The resulting working directory will contain "the current development version"; in git that is called "master" branch. You can subsequently use the "git pull" command to update that, getting any changes from the remote repository: cd emacs git pull Technically, what is happening when you give "git pull" above is that it: (1) Fetches updates to the "remote master branch" (2) Merges those updates into the "local master branch"; this merge is usually trivial but if there are conflicts, may require the user to resolve them. The working directory will be updated in the process. Giving "git push" essentially does the opposite -- transfers any updates to the "local master branch" to the remote master branch. "git commit" commits your W.D. changes to the "local master branch", -Miles -- "Suppose we've chosen the wrong god. Every time we go to church we're just making him madder and madder." -- Homer Simpson