diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2009-01-23 19:02:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 18:57:26 -0800 |
| commit | c30e5673f9614caebf020f934f435db179bd53d4 (patch) | |
| tree | cb109ab9ecea283ba92536066f418ba5bc0fd074 /Documentation | |
| parent | 0990e7aaaa63ca908dbdfc379af132068e4b066f (diff) | |
| download | git-c30e5673f9614caebf020f934f435db179bd53d4.tar.gz git-c30e5673f9614caebf020f934f435db179bd53d4.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gittutorial.txt | 4 |
1 files changed, 1 insertions, 3 deletions
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. |