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>
Miklos Vajna committed
Jan 23, 2009 at 19:02 UTC
c30e5673f9614caebf020f934f435db179bd53d4
1 file changed
+1
-3
Documentation/gittutorial.txt
+1
-3
@@ -308,9 +308,7 @@ alice$ git pull /home/bob/myrepo master
308
309
This merges the changes from Bob's "master" branch into Alice's
310
current branch. If Alice has made her own changes in the meantime,
311
-then she may need to manually fix any conflicts. (Note that the
312
-"master" argument in the above command is actually unnecessary, as it
313
-is the default.)
311
+then she may need to manually fix any conflicts.
312
313
The "pull" command thus performs two operations: it fetches changes
314
from a remote branch, then merges them into the current branch.