X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgittutorial.txt;h=c5d5596d895755d69c8060bc38a800d7c70eda26;hb=5c7eee03da32ac8ff5e91159670558b0d7fb9b1a;hp=458fafdb2cc7e54c5e2f49ca5854e6ec9fe581ee;hpb=cd1dbd37d950f6592d3b84dc95c3863657c3aa7c;p=git.git 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.