Re: Git branching & pulling

From: Wink Saville <wink@saville.com>
Date: May 23, 2007, 00:22 UTC
Message-ID: <d4cf37a60705221722t2167a0e8x810689218b87fb39@mail.gmail.com>
In-Reply-To: <200705202230.24362.Josef.Weidendorfer@gmx.de>

Show 12 quoted lines

>
> Because git does not know what to merge; there is no config entry
> for "branch.test.merge", as the warning says. How would you reword
> this warning to make it easier to understand?
> But from your question, I assume that you expected git to have a
> "branch.test.merge" setting.
> What do you expect it to do? And why?
>
> Is my assumption correct that you want the last command to be equivalent
> to "git-pull . master"? And my further assumption, that you want this
> because you expect "git pull" to default to merging changes from its
> upstream (also when the upstream is local)?

Yes, as you said below that was the old behavior and besides when the branch was created git was told what the upstream was it seems reasonable that it remember that. When I clone a remote it does the right thing it would seem when I make a branch it would behave the same.

>
> 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).

Wink