Blender Fox


GitLab's Default Branch Name

#

GitLab is now implementing a change to make the default branch "main" instead of "master", following GitHub and Atlassian in ditching the "master/slave" namings due to their negative history.

It should be noted that this change this makes little difference to the functionality these sites provide, and to git repositories in general. Also, the default branch can be overridden.

When creating a blank initial repo in GitLab or GitHub (i.e. without a README.md file), the sites will prompt you to push code in using instructions such as this (GitLab haven't yet implemented the master --> main change yet so it still shows master on their instructions)

git clone git@gitlab.com:username/example.git
cd example
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master

But there's nothing to stop you from doing something like

git push -u origin trunk

Instead of master at the time of pushing.

trunk is also one of the three folders used in Subversion Version Control as part of the recommended layout (trunk, tags, branches) -- yes, I did use svn previously, along with Mercurial, Visual SourceSafe, and even cvs.

trunk is also a more logical sounding main branch as you have branches that lead into the trunk of a repo. And the leaves could be considered to be the tags.

While it is great that the big name hosting platforms are migrating away from the master branch idea, it should be noted that you didn't have to have this default branch name originally, nor were you (or are you still) tied to using their choice of main branch name.

Training in Quarantine - Day 116

#

Warm day with a few heavy downpours of rain. Still managed to get a walk done, and realised this postbox I've been walking past for years, doesn't have the "EIIR" logo on it, but has a "GVIR" logo instead.

Which I _believe_ means it's a box erected during George VI's reign (the EIIR stands for Elizabeth II, Regina (queen), and the GVIR stands for George VI, Rex (king)).

If so, this box was erected between 1936-1952, meaning it's at least 68 years old.

Phone Card

#

Who out there remembers these from @bt_uk?

Back before phones took credit cards and before mobile phones were a thing, we had to pre-purchase credit using these cards.

And I think this one is still unused :D

Travelcards

#

In the old days, an off-peak, Zones 1-6 Travelcard would cost you £3.10

Don’t believe me? Here’s one from 1991

The equivalent ticket today would cost you £12.70, or £12.50 on Oyster….

Yes, this is a 27-year-old Travelcard…

London's Ghost Stations: Mapped | Londonist

#

abandonedstations

A really interesting map of all of London’s abandoned and partly-abandoned stations. Some of which I knew about (Mill Hill East for example), others, like Highbury + Islington, which I use daily to get to work, I didn’t know had a different surface building at one point.

Source: London’s Ghost Stations: Mapped | Londonist

History

#

Old styles signs are always so interesting – they last for ages and are a peak into the past

Weird Food from the 50s (with Katherine)

#

Out of things to try for dinner? How about trying what they used to eat in the 50s?

[embed]www.youtube.com/watch