From: Linus Torvalds Date: Wed, 15 Nov 2006 21:31:48 GMT Subject: Re: Cleaning up git user-interface warts Message-ID: In-Reply-To: <200611152212.35978.Josef.Weidendorfer@gmx.de> On Wed, 15 Nov 2006, Josef Weidendorfer wrote: > > I am not really opposed to pull doing a merge. It only should work in > a useful way: ie. only do the merge of updated origin branch when > current branch is master (given "Pull: master:origin"). I absolutely agree. We should _only_ use the default head when pulling from the default head ("master"). If we don't pull from within the default branch, we should either require an explicit head _or_ we should require that an explicit mapping has been set up in .git/config or in .git/remotes/.. So doing a "git pull" from any other branch than "master" should probably by default say "which branch do you want to pull from today"?