| commit | a71fb0a1412c82405f078fb536797d3f5de68d53 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 16 Dec 2006 09:36:32 +0000 (16 01:36 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 16 Dec 2006 21:01:41 +0000 (16 13:01 -0800) | ||
| tree | 521075aa28c42faa477a8ae7e3dda61954b0e077 | treesnapshot (tar.gz zip) |
| parent | 61dde8f91672ab362f3cfd3af8d6d09d448d4ffe | commitdiff |
git-pull: refuse default merge without branch.*.merge
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>
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>
| git-parse-remote.sh | diffblobblamehistory |