mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tutorial: use prompt with user names in example, to clarify who is doing what

Browse Source 
Signed-off-by: Ian Katz <ifreecarve@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ian Katz
2008-07-10 14:27:30 -04:00
committed by Junio C Hamano
parent dc6282d201
commit 5d5e88af5c
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/gittutorial.txt
View File

@ -274,7 +274,7 @@ same machine, wants to contribute.
Bob begins with: 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 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) (edit files)
$ git commit -a bob$ git commit -a
(repeat as necessary) (repeat as necessary)
------------------------------------------------ ------------------------------------------------
@ -293,8 +293,8 @@ When he's ready, he tells Alice to pull changes from the repository
at /home/bob/myrepo. She does this with: at /home/bob/myrepo. She does this with:
------------------------------------------------ ------------------------------------------------
$ cd /home/alice/project alice$ cd /home/alice/project
$ git pull /home/bob/myrepo master alice$ git pull /home/bob/myrepo master
------------------------------------------------ ------------------------------------------------
This merges the changes from Bob's "master" branch into Alice's This merges the changes from Bob's "master" branch into Alice's
@ -312,7 +312,7 @@ again. By defining 'remote' repository shorthand, you can make
it easier: 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 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: using:
------------------------------------- -------------------------------------
$ git fetch bob alice$ git fetch bob
------------------------------------- -------------------------------------
Unlike the longhand form, when Alice fetches from Bob using a 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: `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 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: 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 This `merge` can also be done by 'pulling from her own remote
tracking branch', like this: 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, 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 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; 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 location is
used for pulls: used for pulls:
------------------------------------- -------------------------------------
$ git config --get remote.origin.url bob$ git config --get remote.origin.url
/home/alice/project /home/alice/project
------------------------------------- -------------------------------------
@ -376,7 +376,7 @@ Git also keeps a pristine copy of Alice's master branch under the
name "origin/master": name "origin/master":
------------------------------------- -------------------------------------
$ git branch -r bob$ git branch -r
origin/master origin/master
------------------------------------- -------------------------------------
@ -384,7 +384,7 @@ If Bob later decides to work from a different host, he can still
perform clones and pulls using the ssh protocol: 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; Alternatively, git has a native protocol, or can use rsync or http;