Re: Git branching & pulling

From: Junio C Hamano <junkio@cox.net>
Date: May 23, 2007, 00:35 UTC
Message-ID: <7vwsz05qcq.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <d4cf37a60705221722t2167a0e8x810689218b87fb39@mail.gmail.com>

"Wink Saville" <wink@saville.com> writes:

Show 12 quoted lines

>> Creation of a branch from another local one never has created
>> "branch.x.remote" or "branch.x.merge" entries. I am not even sure
>> that setting "branch.x.remote" to "." is working in the current version.
>
> I tired to create the appropriate entries and it didn't work,
> but maybe operator error.
>
>> BTW: There was some old behavior of "git pull" to always pull the master
>> branch from remote "origin" without any further parameters. I suppose that
>> you did not want this to happen in your example above ?!
>
> I expected it to pull from its upstream (i.e. the branches parent).

While "I branched and that means I will always merge from that branch" does not hold true for everybody, we do have an option to make that easy to work in recent git. Look in git-branch documentation and check autosetupmerge configuration option.

I notice that Paolo did not update Documentation/config.txt when he add this feature with 0746d19a; care to send in a patch to correct this?