Re: confusion over the new branch and merge config
- From
Alan Chandler <alan@chandlerfamily.org.uk>
- Date
- Dec 22, 2006, 15:25 UTC
- Message-ID
- <200612221525.46132.alan@chandlerfamily.org.uk>
- In-Reply-To
- <200612220839.36067.andyparkins@gmail.com>
On Friday 22 December 2006 08:39, Andy Parkins wrote:
Show 5 quoted lines
> Make it almost inconceivable that a remote branch is being starred, > or that a local branch is making it into the "-r" output. > > Alan: could you show a tree of your .git/refs/heads and your > .git/refs/remotes for the repository that is displaying this error?
It wasn't my repository I was responding to - it was Nicolas Pitre's post that listed both remote and local branches - and I then looked at the man page to see what -r did and saw that it said "only" remote branches.
-- Alan Chandler http://www.chandlerfamily.org.uk