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"?
Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html