git-pull: refuse default merge without branch.*.merge
authorJunio C Hamano <junkio@cox.net>
Sat, 16 Dec 2006 09:36:32 +0000 (01:36 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 16 Dec 2006 21:01:41 +0000 (13:01 -0800)
Everybody hated the pull behaviour of merging the first branch
listed on remotes/* file (or remote.*.fetch config) into the
current branch. This finally corrects that UI wart by
forbidding "git pull" without an explicit branch name on the
command line or branch.$current.merge for the current branch.

The matching change to git-clone was made to prepare the default
branch.*.merge entry for the primary branch some time ago.

Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found