"Wink Saville" <wink@xxxxxxxxxxx> writes: >> 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? - 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
