From: Jay Soffian Date: Wed, 11 Mar 2009 04:15:12 GMT Subject: Re: setting up tracking on push Message-ID: <76718490903102115x27a869f2la0d5ca9003bcc95a@mail.gmail.com> In-Reply-To: <20090311035701.GA6089@coredump.intra.peff.net> On Tue, Mar 10, 2009 at 11:57 PM, Jeff King wrote: >> -u w/o --track/--no-track is a usage error. > > Then what is the point of "-u"? You said before that it was a new > operation with room for future growth of additional options. Either it > is _just_ for --track, in which case I think you are better to have a > single option representing the notion of "update the tracking setup", or > it isn't, in which case it needs to have room for future expansion. For *now*, it is just for --track/--no-track, since I can't think of anything sensible that "-u" without --track nor --no-track would do. So it means, update the branch config, but you have to tell it what aspect of the branch config to update. I agree that currently, a single option could do here, but I can't think of a good one. --add-tracking and --delete-tracking? I was trying to re-use the fact that we already have --track and --no-track, but I needed some way to differentiate the mode from "create a new branch". Hence -u. j.