tutorial: use prompt with user names in example, to clarify who is doing what
Signed-off-by: Ian Katz <ifreecarve@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ian Katz committed
Jul 10, 2008 at 14:27 UTC
5d5e88af5cfe614be92bf977aa3ea39d2e8a8db8
1 file changed
+13
-13
Documentation/gittutorial.txt
+13
-13
@@ -274,7 +274,7 @@ same machine, wants to contribute.
274
Bob begins with:
275
276
------------------------------------------------
277
-$ git clone /home/alice/project myrepo
277
+bob$ git clone /home/alice/project myrepo
278
------------------------------------------------
279
280
This creates a new directory "myrepo" containing a clone of Alice's
@@ -285,7 +285,7 @@ Bob then makes some changes and commits them:
285
286
------------------------------------------------
287
(edit files)
288
-$ git commit -a
288
+bob$ git commit -a
289
(repeat as necessary)
290
------------------------------------------------
291
@@ -293,8 +293,8 @@ When he's ready, he tells Alice to pull changes from the repository
293
at /home/bob/myrepo. She does this with:
294
295
------------------------------------------------
296
-$ cd /home/alice/project
297
-$ git pull /home/bob/myrepo master
296
+alice$ cd /home/alice/project
297
+alice$ git pull /home/bob/myrepo master
298
------------------------------------------------
299
300
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
312
it easier:
313
314
------------------------------------------------
315
-$ git remote add bob /home/bob/myrepo
315
+alice$ git remote add bob /home/bob/myrepo
316
------------------------------------------------
317
318
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
320
using:
321
322
-------------------------------------
323
-$ git fetch bob
323
+alice$ git fetch bob
324
-------------------------------------
325
326
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
329
`bob/master`. So after this:
330
331
-------------------------------------
332
-$ git log -p master..bob/master
332
+alice$ git log -p master..bob/master
333
-------------------------------------
334
335
shows a list of all the changes that Bob made since he branched from
@@ -339,14 +339,14 @@ After examining those changes, Alice
339
could merge the changes into her master branch:
340
341
-------------------------------------
342
-$ git merge bob/master
342
+alice$ git merge bob/master
343
-------------------------------------
344
345
This `merge` can also be done by 'pulling from her own remote
346
tracking branch', like this:
347
348
-------------------------------------
349
-$ git pull . remotes/bob/master
349
+alice$ git pull . remotes/bob/master
350
-------------------------------------
351
352
Note that git pull always merges into the current branch,
@@ -355,7 +355,7 @@ regardless of what else is given on the command line.
355
Later, Bob can update his repo with Alice's latest changes using
356
357
-------------------------------------
358
-$ git pull
358
+bob$ git pull
359
-------------------------------------
360
361
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
364
used for pulls:
365
366
-------------------------------------
367
-$ git config --get remote.origin.url
367
+bob$ git config --get remote.origin.url
368
/home/alice/project
369
-------------------------------------
370
@@ -376,7 +376,7 @@ Git also keeps a pristine copy of Alice's master branch under the
376
name "origin/master":
377
378
-------------------------------------
379
-$ git branch -r
379
+bob$ git branch -r
380
origin/master
381
-------------------------------------
382
@@ -384,7 +384,7 @@ If Bob later decides to work from a different host, he can still
384
perform clones and pulls using the ssh protocol:
385
386
-------------------------------------
387
-$ git clone alice.org:/home/alice/project myrepo
387
+bob$ git clone alice.org:/home/alice/project myrepo
388
-------------------------------------
389
390
Alternatively, git has a native protocol, or can use rsync or http;