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 c...@elego.de 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

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

2012-07-11 Thread Junio C Hamano
Carlos Martín Nieto c...@elego.de 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

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

2012-07-10 Thread Junio C Hamano
Carlos Martín Nieto c...@elego.de 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