Minor changes

[nhardy]

Including previous commits (other pull request(s))

[Mause]

Hrm, damn. If you close this and resubmit it it'll probably exclude the commits from the other PR's though

[nhardy]

I'll try that and if not I can just merge master into this and retry.

[Mause]

Actually, try merging master in first

[sysr-q]

When in doubt, press the nearest big green button you see on GitHub.

[Mause]

XD

[Mause]

(you'd have to do a PR do be able to hit a big green button and merge in master, and a PR is kinda overkill for that)

[nhardy]

Did it.

[Mause]

It appears to have worked too :D

[nhardy]

Definitely working on individual feature branches next time.

[Mause]

heh :) just remember to always git branch <name> whilst on master, to ensure that you're branching off master

[sysr-q]

git checkout -b <branch-name> please, plebeians.

[Mause]

@plausibility difference?

[nhardy]

Same as

git branch <branch>
git checkout <branch>

[Mause]

fair enough, I've been taking the ful route of

git branch <branch-name>
git checkout <branch-name>