From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Ian Katz" Subject: Re: [PATCH] tutorial: prefix the prompts with names alice or bob, to make it clear who is doing what Date: Thu, 10 Jul 2008 14:27:30 -0400 Message-ID: References: <20080710164520.GZ10347@genesis.frugalware.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: "Miklos Vajna" X-From: git-owner@vger.kernel.org Thu Jul 10 20:28:42 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KH0sa-0000as-7I for gcvg-git-2@gmane.org; Thu, 10 Jul 2008 20:28:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756891AbYGJS1c (ORCPT ); Thu, 10 Jul 2008 14:27:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757612AbYGJS1c (ORCPT ); Thu, 10 Jul 2008 14:27:32 -0400 Received: from an-out-0708.google.com ([209.85.132.241]:1474 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755631AbYGJS1b (ORCPT ); Thu, 10 Jul 2008 14:27:31 -0400 Received: by an-out-0708.google.com with SMTP id d40so706913and.103 for ; Thu, 10 Jul 2008 11:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=Sz6xujnlQk3AM5/1b/GSbFD8Vh0EUrF9Un+O+qVQNb0=; b=us5aq6BheBxmlEGkLGJAV3BQ99Kjj7OWAxI2j/TU0BH6iGzUe1XLm927W1VOPu1t80 o5Vm18n8DthudSQVSkeAZH86/u1qg3tYaR7LwMKWbHltfYKqOSSgVjR+ksrWCvBqoWcg 13iqNepeSwl9DrZ/NTsNfNvEk0IIRroLtE96o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=SMsW+TkFMOnMmXU3o7ecKRLPoWnFU+I5dm9Ba7eiJt+vEwL1VmFgVCxqCVvM2B+A2x jNalHvK8eONpgHd18kDnABLXRg9/XfaZh7zRxwsJ411OpVZhuaXTCjH+DaMB9HLE6hc3 gaXyYvdX+Swgb7ALgOqla0I/8eTZqNL4Ex3MU= Received: by 10.100.140.15 with SMTP id n15mr7665680and.110.1215714450398; Thu, 10 Jul 2008 11:27:30 -0700 (PDT) Received: by 10.100.191.4 with HTTP; Thu, 10 Jul 2008 11:27:30 -0700 (PDT) In-Reply-To: <20080710164520.GZ10347@genesis.frugalware.org> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Ian Katz --- Documentation/gittutorial.txt | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index e71b561..e4248b6 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -274,7 +274,7 @@ same machine, wants to contribute. Bob begins with: ------------------------------------------------ -$ git clone /home/alice/project myrepo +bob$ git clone /home/alice/project myrepo ------------------------------------------------ This creates a new directory "myrepo" containing a clone of Alice's @@ -285,7 +285,7 @@ Bob then makes some changes and commits them: ------------------------------------------------ (edit files) -$ git commit -a +bob$ git commit -a (repeat as necessary) ------------------------------------------------ @@ -293,8 +293,8 @@ When he's ready, he tells Alice to pull changes from the rep ository at /home/bob/myrepo. She does this with: ------------------------------------------------ -$ cd /home/alice/project -$ git pull /home/bob/myrepo master +alice$ cd /home/alice/project +alice$ git pull /home/bob/myrepo master ------------------------------------------------ This merges the changes from Bob's "master" branch into Alice's @@ -312,7 +312,7 @@ again. By defining 'remote' repository shorthand, you can m ake it easier: ------------------------------------------------ -$ git remote add bob /home/bob/myrepo +alice$ git remote add bob /home/bob/myrepo ------------------------------------------------ With this, Alice can perform the first operation alone using the @@ -320,7 +320,7 @@ With this, Alice can perform the first operation alone using the using: ------------------------------------- -$ git fetch bob +alice$ git fetch bob ------------------------------------- Unlike the longhand form, when Alice fetches from Bob using a @@ -329,7 +329,7 @@ fetched is stored in a remote tracking branch, in this case `bob/master`. So after this: ------------------------------------- -$ git log -p master..bob/master +alice$ git log -p master..bob/master ------------------------------------- shows a list of all the changes that Bob made since he branched from @@ -339,14 +339,14 @@ After examining those changes, Alice could merge the changes into her master branch: ------------------------------------- -$ git merge bob/master +alice$ git merge bob/master ------------------------------------- This `merge` can also be done by 'pulling from her own remote tracking branch', like this: ------------------------------------- -$ git pull . remotes/bob/master +alice$ git pull . remotes/bob/master ------------------------------------- Note that git pull always merges into the current branch, @@ -355,7 +355,7 @@ regardless of what else is given on the command line. Later, Bob can update his repo with Alice's latest changes using ------------------------------------- -$ git pull +bob$ git pull ------------------------------------- Note that he doesn't need to give the path to Alice's repository; @@ -364,7 +364,7 @@ repository in the repository configuration, and that locatio n is used for pulls: ------------------------------------- -$ git config --get remote.origin.url +bob$ git config --get remote.origin.url /home/alice/project ------------------------------------- @@ -376,7 +376,7 @@ Git also keeps a pristine copy of Alice's master branch unde r the name "origin/master": ------------------------------------- -$ git branch -r +bob$ git branch -r origin/master ------------------------------------- @@ -384,7 +384,7 @@ If Bob later decides to work from a different host, he can s till perform clones and pulls using the ssh protocol: ------------------------------------- -$ git clone alice.org:/home/alice/project myrepo +bob$ git clone alice.org:/home/alice/project myrepo ------------------------------------- Alternatively, git has a native protocol, or can use rsync or http; -- 1.5.3.7