aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/branch.tcl
diff options
context:
space:
mode:
authorThomas Ackermann <th.acker@arcor.de>2013-08-27 19:58:18 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-27 15:14:43 -0700
commita7bdee1122297442ac8eaaecf20db7363d48a14e (patch)
tree0251d0909f4214d2bd38c3a47fae969c9fc34d1e /git-gui/lib/branch.tcl
parent3e65ac49e77283cf505b912c9a2b1bc05b7cd7a0 (diff)
downloadgit-a7bdee1122297442ac8eaaecf20db7363d48a14e.tar.gz
git-a7bdee1122297442ac8eaaecf20db7363d48a14e.tar.xz
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>
Diffstat (limited to 'git-gui/lib/branch.tcl')
0 files changed, 0 insertions, 0 deletions