From: Junio C Hamano Date: Wed, 11 Jul 2012 16:53:07 GMT Subject: Re: [PATCH 3/3] branch: add --unset-upstream option Message-ID: <7vfw8yfde4.fsf@alter.siamese.dyndns.org> In-Reply-To: <1342016087.6458.10.camel@centaur.cmartin.tk> 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 actually thought about commenting on that exact variable in my review, saying that the patch was correct that it didn't touch it.