From: Carlos Martín Nieto Date: Thu, 12 Jul 2012 10:27:46 GMT Subject: Re: [PATCH 3/3] branch: add --unset-upstream option Message-ID: <1342088866.6458.24.camel@centaur.cmartin.tk> In-Reply-To: <7vfw8yfde4.fsf@alter.siamese.dyndns.org> 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 "--integrate-with=[rebase|merge]" to set the variable, I > would agree that removing branch.$name.rebase would be the right > thing to do, but because it is not, I do not know if it is sensible > to remove it upon --unset-upstream. I'll drop it then. cmn