summaryrefslogtreecommitdiff
path: root/Documentation/tutorial.txt
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-01-15 03:44:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-15 05:12:14 (GMT)
commitc14261eaa297504799e3b21ecbd751edbae912c0 (patch)
tree26729b99c1fdc3549bdc12aef9c3e8d55eb59983 /Documentation/tutorial.txt
parentadb7ba6b116c0ec26e058b9b41a5a528d123323f (diff)
downloadgit-c14261eaa297504799e3b21ecbd751edbae912c0.zip
git-c14261eaa297504799e3b21ecbd751edbae912c0.tar.gz
git-c14261eaa297504799e3b21ecbd751edbae912c0.tar.bz2
some doc updates
1) talk about "git merge" instead of "git pull ." 2) suggest "git repo-config" instead of directly editing config files 3) echo "URL: blah" > .git/remotes/foo is obsolete and should be "git repo-config remote.foo.url blah" 4) support for partial URL prefix has been removed (see commit ea560e6d64374ec1f6c163c276319a3da21a1345) so drop mention of it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/tutorial.txt')
-rw-r--r--Documentation/tutorial.txt20
1 files changed, 9 insertions, 11 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index d2bf0b9..8325c5e 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -11,15 +11,13 @@ diff" with:
$ man git-diff
------------------------------------------------
-It is a good idea to introduce yourself to git before doing any
-operation. The easiest way to do so is:
+It is a good idea to introduce yourself to git with your name and
+public email address before doing any operation. The easiest
+way to do so is:
------------------------------------------------
-$ cat >~/.gitconfig <<\EOF
-[user]
- name = Your Name Comes Here
- email = you@yourdomain.example.com
-EOF
+$ git repo-config --global user.name "Your Name Comes Here"
+$ git repo-config --global user.email you@yourdomain.example.com
------------------------------------------------
@@ -211,7 +209,7 @@ at this point the two branches have diverged, with different changes
made in each. To merge the changes made in experimental into master, run
------------------------------------------------
-$ git pull . experimental
+$ git merge experimental
------------------------------------------------
If the changes don't conflict, you're done. If there are conflicts,
@@ -316,14 +314,14 @@ shows a list of all the changes that Bob made since he branched from
Alice's master branch.
After examining those changes, and possibly fixing things, Alice
-could pull the changes into her master branch:
+could merge the changes into her master branch:
-------------------------------------
$ git checkout master
-$ git pull . bob-incoming
+$ git merge bob-incoming
-------------------------------------
-The last command is a pull from the "bob-incoming" branch in Alice's
+The last command is a merge from the "bob-incoming" branch in Alice's
own repository.
Alice could also perform both steps at once with: