kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gittutorial: remove misleading note 

In the tutorial Alice initializes the repository, and Bob clones it. So
Bob can just do a 'git pull', but Alice will need 'git pull <url>
<branch>'.

The note suggested that the branch parameter is not necessary, which is
no longer true these days.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Miklos Vajna 2009-01-23 19:02:29 +01:00 committed by Junio C Hamano
parent 0990e7aaaa
commit c30e5673f9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/gittutorial.txt
View File

@ -308,9 +308,7 @@ 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
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.
"master" argument in the above command is actually unnecessary, as it
is the default.)


The "pull" command thus performs two operations: it fetches changes 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.