undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tutorial: Use only separate layout

Browse Source 
Then the newbies only have to understand one layout.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Santi Béjar 2007-01-17 01:09:12 +01:00 committed by Junio C Hamano
parent 8bef62049b
commit 8b616f24ea
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/tutorial.txt
View File

@ -283,10 +283,12 @@ at /home/bob/myrepo. She does this with:
------------------------------------------------ ------------------------------------------------
$ cd /home/alice/project $ cd /home/alice/project
$ git pull /home/bob/myrepo master $ git remote add bob /home/bob/myrepo
$ git pull bob master
------------------------------------------------ ------------------------------------------------
This merges the changes from Bob's "master" branch into Alice's First it adds the "remote" Bob's repository with the name "bob" and
then it merges the changes from Bob's "master" branch into Alice's
current branch. If Alice has made her own changes in the meantime, current branch. If Alice has made her own changes in the meantime,
then she may need to manually fix any conflicts. (Note that the then she may need to manually fix any conflicts. (Note that the
"master" argument in the above command is actually unnecessary, as it "master" argument in the above command is actually unnecessary, as it
@ -296,18 +298,16 @@ The "pull" command thus performs two operations: it fetches changes
from a remote branch, then merges them into the current branch. from a remote branch, then merges them into the current branch.
You can perform the first operation alone using the "git fetch" You can perform the first operation alone using the "git fetch"
command. For example, Alice could create a temporary branch just to command without merging them with her own branch, using:
track Bob's changes, without merging them with her own, using:
------------------------------------- -------------------------------------
$ git fetch /home/bob/myrepo master:bob-incoming $ git fetch bob
------------------------------------- -------------------------------------
which fetches the changes from Bob's master branch into a new branch which fetches the changes from Bob's branches. Then
named bob-incoming. Then
------------------------------------- -------------------------------------
$ git log -p master..bob-incoming $ 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
@ -318,21 +318,21 @@ could merge the changes into her master branch:
------------------------------------- -------------------------------------
$ git checkout master $ git checkout master
$ git merge bob-incoming $ git merge bob/master
------------------------------------- -------------------------------------
The last command is a merge from the "bob-incoming" branch in Alice's The last command is a merge of the "bob/master" branch in Alice's
own repository. own repository.
Alice could also perform both steps at once with: Alice could also perform both steps at once with:
------------------------------------- -------------------------------------
$ git pull /home/bob/myrepo master:bob-incoming $ git pull bob
------------------------------------- -------------------------------------
This is just like the "git pull /home/bob/myrepo master" that we saw This is just like the "git pull bob master" that we saw
before, except that it also stores the unmerged changes from bob's before, except that it also stores the unmerged changes from bob's
master branch in bob-incoming before merging them into Alice's master branch in bob/master before merging them into Alice's
current branch. Note that git pull always merges into the current current branch. Note that git pull always merges into the current
branch, regardless of what else is given on the commandline. branch, regardless of what else is given on the commandline.