From: Jay Soffian Date: Sun, 17 Feb 2008 18:05:36 GMT Subject: Re: [RFC PATCH 1/2] git-branch: allow --track to work w/local branches Message-ID: <76718490802171005xaed572dkd59ed822897fdb3a@mail.gmail.com> In-Reply-To: On Feb 16, 2008 6:45 AM, Johannes Schindelin wrote: > AFAIR the problem was that you were (rightfully) annoyed when you were > setting up your local branches, and all of a sudden, they were set up with > loads of tracking information, cluttering your config. > > Basically, that is the reason why we disallowed tracking information to be > set up for local branching. Hrmm, I was annoyed that when setting up my local branches, they *don't* get tracking information. Otherwise I can't use "git pull" with them, which I'd like to. So maybe something like: * Using --track or --notrack adds (or doesn't) the information, because well, I specified it explicitly. * Otherwise (if neither --track nor --notrack) is specified, check the setting of branch.autosetupmerge. Currently it's a boolean, but perhaps it can take on a new setting and have: - false - true - always ; new setting which means to setup tracking information for ; both local and remote branches ? j.