Use "git merge" instead of "git pull ."
authorThomas Ackermann <th.acker@arcor.de>
Tue, 27 Aug 2013 17:58:18 +0000 (19:58 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Aug 2013 22:14:43 +0000 (15:14 -0700)
commita7bdee1...22297442ac8eaaecf20db7363d48a14e
tree0251d09...9f4214d2bd38c3a47fae969c9fc34d1ecopy hash to clipboard (tree)
parent3e65ac4...e77283cf505b912c9a2b1bc05b7cd7a0copy hash to clipboard (diff)
Documentation/user-manual.txt