From: Miklos Vajna Date: Fri, 23 Jan 2009 18:02:29 +0000 (+0100) Subject: gittutorial: remove misleading note X-Git-Tag: v1.6.2-rc0~87 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c30e5673f9614caebf020f934f435db179bd53d4;p=git.git 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 '. The note suggested that the branch parameter is not necessary, which is no longer true these days. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index 458fafdb2..c5d5596d8 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -308,9 +308,7 @@ alice$ git pull /home/bob/myrepo master This merges the changes from Bob's "master" branch into Alice's current branch. If Alice has made her own changes in the meantime, -then she may need to manually fix any conflicts. (Note that the -"master" argument in the above command is actually unnecessary, as it -is the default.) +then she may need to manually fix any conflicts. The "pull" command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch.