Re: defaults for where to merge from

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Thu, 1 Mar 2007, Alex Riesen wrote:

> Well, I find it unobvious for pull to magically starting merging.

Pull is _all_ about merging.

> Perhaps I'm using branch configuration in .git/config for too long, and 
> actually expect nothing to be merged if there is no appropriate branch 
> configuration.

It is not possible that you use that feature you described for too long, 
since it was not there in 1.4.x. There, whenever you said "git pull", it 
would try to blindly pull the default branch of the remote "origin", which 
might have been correct for the default branch (i.e. the branch 
automatically set up by git-clone), but not necessarily for the other 
branches.

And I want to stress a very important point: this automatic setting of the 
default remote and branch-to-merge should be _only_ triggered when 
branching from refs in $GIT_DIR/refs/remotes. Even if you _do_ branch them 
from scripts, I doubt that you'll break _anything_, except of course when 
the scripts are buggy to begin with.

There is a good chance that some user wants to merge something 
different, but in that case you have to specify what to merge _anyway_.

However, with the proposed behaviour, more new users would get less "Huh?" 
experiences.

Ciao,
Dscho