Re: [PATCH] git-pull: refuse default merge without branch.*.merge
- From
Linus Torvalds <torvalds@osdl.org>
- Date
- Dec 16, 2006, 16:44 UTC
- Message-ID
- <Pine.LNX.4.64.0612160840300.3557@woody.osdl.org>
- In-Reply-To
- <7v3b7gji73.fsf@assigned-by-dhcp.cox.net>
On Sat, 16 Dec 2006, Junio C Hamano wrote:
Show 6 quoted lines
> > 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.
Yay!
May I suggest also just merging the built-in 3-way merge, and just calling the resulting version 1.5.0?
With all the "git add" and documentation cleanups, and these kinds of fundamental changes in behaviour (not that anybody will hopefully _notice_, and if they do they'll hopefully just be grateful, but it's still conceptually a big step), I think it's definitely worth a new version number.
Maybe even "2.0", although since we're still backwards compatible in all ways that really matter, a major number might be too big a step.