tree 0251d0909f4214d2bd38c3a47fae969c9fc34d1e
parent 3e65ac49e77283cf505b912c9a2b1bc05b7cd7a0
author Thomas Ackermann <th.acker@arcor.de> 1377626298 +0200
committer Junio C Hamano <gitster@pobox.com> 1377641683 -0700

Use "git merge" instead of "git pull ."

"git pull ." works, but "git merge" is the recommended
way for new users to do things. (The old description
also should have read "The former is actually *not* very
commonly used".)

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>