index bd9fbee99aeb67c5362523d6b4cb43d4889cf8a5..fff1068c54e313efd4fb16a330c24d4749bc7712 100644 (file)
-------------------------------------
Note that git pull always merges into the current branch,
-regardless of what else is given on the commandline.
+regardless of what else is given on the command line.
Later, Bob can update his repo with Alice's latest changes using