v2.1.x branch renamed to v2.x.x

[Arran Cudbard-Bell]

On 28 Oct 2012, at 12:23, Phil Mayers <p.mayers at IMPERIAL.AC.UK> wrote:

> On 10/28/2012 12:19 PM, Phil Mayers wrote:
>> On 10/28/2012 10:12 AM, Arran Cudbard-Bell wrote:
>>> Someone was complaining about the branch name v2.1.x being confusing
>>> now were on 2.2.0. There's no point in maintaining a branch for v2.1.x
>>> because there's never going to be further development.
>>> 
>>> To fixup branches in your fork:
>> 
>> Eww..
>> 
>> Related: has something funny happened to the "master" branch:
>> 
> 
> Oh dear... "funny" is a bit of an understatement. It looks like we've gone back in time 9 months.

Yeah something extremely weird happened when I tried to merge some guys changes back in. I've now corrected it.

You might have to dig out the last few commits and git pull to get back to the correct HEAD ref.

-Arran