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: Sun, 06 Jan 2008 10:10:04 +0900 Message-ID: <87d4sfpxn7.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> <20080102121745.GD17588@thyrsus.com> <87myrmjgqf.fsf@catnip.gol.com> 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 1199581852 10398 80.91.229.12 (6 Jan 2008 01:10:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 6 Jan 2008 01:10:52 +0000 (UTC) Cc: esr@thyrsus.com, acm@muc.de, eliz@gnu.org, emacs-devel@gnu.org, esr@snark.thyrsus.com To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 06 02:11:12 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 1JBK2g-0004Gl-Tb for ged-emacs-devel@m.gmane.org; Sun, 06 Jan 2008 02:11:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBK2K-0000ir-Bd for ged-emacs-devel@m.gmane.org; Sat, 05 Jan 2008 20:10:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JBK1w-0000RK-Dr for emacs-devel@gnu.org; Sat, 05 Jan 2008 20:10:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JBK1u-0000PX-Qk for emacs-devel@gnu.org; Sat, 05 Jan 2008 20:10:23 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JBK1u-0000PK-94 for emacs-devel@gnu.org; Sat, 05 Jan 2008 20:10:22 -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 1JBK1j-0000LZ-9r; Sat, 05 Jan 2008 20:10: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 1JBK1d-00043N-Lx; Sun, 06 Jan 2008 10:10:05 +0900 Original-Received: by catnip.gol.com (Postfix, from userid 1000) id 819C52FF7; Sun, 6 Jan 2008 10:10:04 +0900 (JST) System-Type: i686-pc-linux-gnu In-Reply-To: (Richard Stallman's message of "Sat, 05 Jan 2008 09:30:00 -0500") Original-Lines: 33 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:86271 Archived-At: Richard Stallman writes: > Yes there is a concept of a trunk -- at least with git, each repository > can contain named branches (each a reference to the tip of some > development line), and the branch called "master" is the default for > many operations. > > So which is the operation that alters the current version in the > trunk? For _your_ new changes: git commit For getting _others_ changes from a remote repository: git pull There are other commands that affect things, but the above are the most common. For people that use git, they really do think of "git commit" as the git analogue of "cvs commit" -- it does "most of the things" cvs commit does. I guess you can think of cvs commit as being split into two different commands in git: git commit (which does most of the work -- bundling up the changes to your working directory, adding a log message, updating the head of the current branch), and git push (which sends your local changes to a remote repository). Stephen Turnbull posted a good explanation in this thread. -Miles -- I'm beginning to think that life is just one long Yoko Ono album; no rhyme or reason, just a lot of incoherent shrieks and then it's over. --Ian Wolff