From: Alex Riesen Date: Thu, 01 Mar 2007 00:07:07 GMT Subject: Re: defaults for where to merge from Message-ID: <81b0412b0702281607l6f9b1cadg9f3a84b06b9acd7d@mail.gmail.com> In-Reply-To: <45E5DE8A.2080101@lu.unisi.ch> On 2/28/07, Paolo Bonzini wrote: > > 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.