index f1f4086389445a44645e57c2340cc94266f92835..0982f74ef6212577afb74d86079472662e2bffba 100644 (file)
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