* [PATCH] gittutorial: remove misleading note
@ 2009-01-23 18:02 Miklos Vajna
2009-01-23 19:00 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Miklos Vajna @ 2009-01-23 18:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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>
---
The problem was reported by DanC on IRC.
Documentation/gittutorial.txt | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 458fafd..c5d5596 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.
--
1.6.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-01-23 21:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-23 18:02 [PATCH] gittutorial: remove misleading note Miklos Vajna
2009-01-23 19:00 ` Junio C Hamano
2009-01-23 21:17 ` Miklos Vajna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).