Use git-merge in git-pull (second try).
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Sep 2005 02:43:51 +0000 (19:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 29 Sep 2005 07:24:41 +0000 (00:24 -0700)
commit60fb5b2...4d9e26204f480f8a18ae1ff0051a6440
treea05853f...c4566d06f279267fdf783efe35f355e7copy hash to clipboard (tree)
parentbf7960e...51a26bcf52f27a60bfcf005661266b1ecopy hash to clipboard (diff)
git-pull.sh