Code

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)
commit60fb5b2c4d9e26204f480f8a18ae1ff0051a6440
treea05853f1c4566d06f279267fdf783efe35f355e7
parentbf7960eb51a26bcf52f27a60bfcf005661266b1e
Use git-merge in git-pull (second try).

This again makes git-pull to use git-merge, so that different merge
strategy can be specified from the command line.  Without explicit
strategy parameter, it defaults to git-merge-resolve if only one
remote is pulled, and git-merge-octopus otherwise, to keep the
default behaviour of the command the same as the original.

Also this brings another usability measure: -n flag from the command
line, if given, is passed to git-merge to prevent it from running the
diffstat at the end of the merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh