aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gittutorial.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:21 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:19:08 -0700
commit60109d0ef5974b5066b6998fafe1da7187174c88 (patch)
tree1d80ece33944d16bea32c447c01369b0a8b25900 /Documentation/gittutorial.txt
parent0e615b252f35006ea824fae1a95dc6af55326b9a (diff)
downloadgit-60109d0ef5974b5066b6998fafe1da7187174c88.tar.gz
git-60109d0ef5974b5066b6998fafe1da7187174c88.tar.xz
Change remote tracking to remote-tracking in non-trivial places
To complement the straightforward perl application in previous patch, this adds a few manual changes. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gittutorial.txt')
-rw-r--r--Documentation/gittutorial.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index f1f408638..0982f74ef 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -402,8 +402,8 @@ could merge the changes into her master branch:
alice$ git merge bob/master
-------------------------------------
-This `merge` can also be done by 'pulling from her own remote
-tracking branch', like this:
+This `merge` can also be done by 'pulling from her own remote-tracking
+branch', like this:
-------------------------------------
alice$ git pull . remotes/bob/master