diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
| commit | 20d47e3f1442b9a7384b08ea40846c078f227a47 (patch) | |
| tree | 0e2eafa5965e7d5044b5b7d3c6e5e16430b4865f /gittutorial.txt | |
| parent | 22bcc112adfbdb908fb26cbdb2a89b0db95652a4 (diff) | |
| download | git-htmldocs-20d47e3f1442b9a7384b08ea40846c078f227a47.tar.gz | |
Autogenerated HTML docs for v1.6.1.1-223-gc30e5
Diffstat (limited to 'gittutorial.txt')
| -rw-r--r-- | gittutorial.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gittutorial.txt b/gittutorial.txt index 458fafdb2..c5d5596d8 100644 --- a/gittutorial.txt +++ b/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. |