From: "Santi Béjar" <sbejar@gmail•com>
To: Git Mailing List <git@vger•kernel.org>
Subject: [PATCH 2/2] tutorial: Use "git merge" instead of "git pull ."
Date: Fri, 12 Jan 2007 12:58:21 +0100 [thread overview]
Message-ID: <87odp4319e.fsf@gmail.com> (raw)
Signed-off-by: Santi Béjar <sbejar@gmail•com>
---
Documentation/tutorial.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 4b7eba3..45abfa5 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -211,7 +211,7 @@ at this point the two branches have diverged, with different changes
made in each. To merge the changes made in experimental into master, run
------------------------------------------------
-$ git pull . experimental
+$ git merge experimental
------------------------------------------------
If the changes don't conflict, you're done. If there are conflicts,
@@ -320,10 +320,10 @@ could pull the changes into her master branch:
-------------------------------------
$ git checkout master
-$ git pull . remotes/bob/master
+$ git merge bob/master
-------------------------------------
-The last command is a pull from the "bob/master" branch in Alice's
+The last command is a merge of the "bob/master" branch in Alice's
own repository.
Alice could also perform both steps at once with:
--
1.5.0-rc1.GIT
reply other threads:[~2007-01-12 10:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87odp4319e.fsf@gmail.com \
--to=sbejar@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox