Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gittutorial: remove misleading note
author
Miklos Vajna
<vmiklos@frugalware.org>
Fri, 23 Jan 2009 18:02:29 +0000
(19:02 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 26 Jan 2009 02:57:26 +0000
(18:57 -0800)
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>
Documentation/gittutorial.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
0990e7a
)
diff --git
a/Documentation/gittutorial.txt
b/Documentation/gittutorial.txt
index 458fafdb2cc7e54c5e2f49ca5854e6ec9fe581ee..c5d5596d895755d69c8060bc38a800d7c70eda26 100644
(file)
--- 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.