Re: [PATCH 3/3] branch: add --unset-upstream option

2012-07-12 Thread Carlos Martín Nieto
On Wed, 2012-07-11 at 09:53 -0700, Junio C Hamano wrote: > Carlos Martín Nieto writes: > > > I've added a bit of code to also remove branch.foo.rebase, which > > I'd also consider to be part of the upstream information. > > If "git branch -t" or "git branch --set-upstream" took another > option

Re: [PATCH 3/3] branch: add --unset-upstream option

2012-07-11 Thread Junio C Hamano
Carlos Martín Nieto writes: > I've added a bit of code to also remove branch.foo.rebase, which > I'd also consider to be part of the upstream information. If "git branch -t" or "git branch --set-upstream" took another option "--integrate-with=[rebase|merge]" to set the variable, I would agree th

Re: [PATCH 3/3] branch: add --unset-upstream option

2012-07-11 Thread Carlos Martín Nieto
On Tue, 2012-07-10 at 11:02 -0700, Junio C Hamano wrote: > Carlos Martín Nieto writes: > > > We have ways of setting the upstream information, but if we want to > > unset it, we need to resort to modifying the configuration manually. > > > > Teach branch an --unset-upstream option that unsets thi

Re: [PATCH 3/3] branch: add --unset-upstream option

2012-07-10 Thread Junio C Hamano
Carlos Martín Nieto writes: > We have ways of setting the upstream information, but if we want to > unset it, we need to resort to modifying the configuration manually. > > Teach branch an --unset-upstream option that unsets this information. > > --- > > create_branch() uses install_branch_config

[PATCH 3/3] branch: add --unset-upstream option

2012-07-10 Thread Carlos Martín Nieto
We have ways of setting the upstream information, but if we want to unset it, we need to resort to modifying the configuration manually. Teach branch an --unset-upstream option that unsets this information. --- create_branch() uses install_branch_config() which may also set branch.foo.rebase, so