From: Rajkumar S Date: Fri, 15 Sep 2006 12:18:01 GMT Subject: Re: Tracking a branch using StGIT Message-ID: <64de5c8b0609150518x279e786tc11b85171dcbe899@mail.gmail.com> In-Reply-To: On 9/15/06, Jakub Narebski wrote: > Besides in remotes file you have only specified which remote branch > is tracked by which local branch. Additionally all but first are marked > as not-for-merge. There is no place for default branch to merge with. > > There was some discussion about moving remotes information into config > file, including marking tracking branches as read-only, marking default > branch to merge (or marking branch as for-merge/not-for-merge), marking > branch as of not fast-forwarding type (like 'pu' in git.git) on the > _server_ side etc. But it petered out, unfortunately. Thanks a lot for your comments, I have just put the RELENG_1 line in the remotes and have RELENG_1 always checked out. raj