Re: defaults for where to merge from
From: Alex Riesen <hidden>
Date: 2016-06-15 22:42:57
On 2/28/07, Paolo Bonzini [off-list ref] wrote:
quoted
As is an option to disable the feature. I.e. for scripts, which create branches blindly, without knowing they working on a remote branch. So, please, provide an option to do what git-checkout/git-branch did before: which is just create the branch, nothing more.This does create the branch and nothing more.
... except ...
It sets up "git pull" to do the obvious thing, but does not do anything more. The branch is left in the same state than without the patch. So the scripts will still work unless they create branches blindly, and blindly do a "git pull" expecting it to do the unobvious thing.
Well, I find it unobvious for pull to magically starting 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.