| commit | a7bdee1122297442ac8eaaecf20db7363d48a14e | |
| author | Thomas Ackermann <th.acker@arcor.de> | |
| Tue, 27 Aug 2013 17:58:18 +0000 (27 19:58 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Aug 2013 22:14:43 +0000 (27 15:14 -0700) | ||
| tree | 0251d0909f4214d2bd38c3a47fae969c9fc34d1e | treesnapshot (tar.gz zip) |
| parent | 3e65ac49e77283cf505b912c9a2b1bc05b7cd7a0 | commitdiff |
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>
"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>
| Documentation/user-manual.txt | diffblobblamehistory |