Git

Mildly obfusticated version control

A talk by Wraithan

Why trust me?

• Started using git in 2008
• Have taugh and/or developed robust git flows for multiple companies
• Your teachers are letting me teach you

Getting the project

git clone https://github.com/zenirc/zenircbot

Updating the project

git pull [--rebase]

Making a branch

git checkout -b my_branch

Adding your changes

git add -p

Commiting your changes

git commit -m "man these changes are awesome"

Pushing your changes

git push

Lets play

https://try.github.io/

Configuration

git config --global section.key value

Basics

git config --global user.name "Wraithan (Chris McDonald)"
git config --global user.email xwraithanx@gmail.com

Colors!

git config --global color.ui auto

Being deliberate

git config --global push.default current

Less typing

git config --global merge.defaultToUpstream true

Scary stuff

git rebase