Slide 1

Slide 1 text

GIT: AN ENTHUSIASTIC USER'S POINT-OF-VIEW Alex Townsend [email protected]

Slide 2

Slide 2 text

WHAT IS GIT? In British English (slang) “an unpleasant or contemptible old man” Linus Torvalds: “I name all projects after myself” Distributed version control software (as opposed to a client-server approach) (as opposed to Dropbox) (as opposed to Google Docs)

Slide 3

Slide 3 text

WHY USE GIT? 1. Collaboration is made easy, 2. Distributed version control software (no central server), 3. Github provides an excellent online server and GUI, 4. Designed specifically for software development.

Slide 4

Slide 4 text

git-scm.com Mac users may already have it with Xcode

Slide 5

Slide 5 text

12.5 git init git clone git add git commit git branch git checkout git merge git remote git pull git push git diff git log Not too many commands to learn (git reset)

Slide 6

Slide 6 text

GitHub

Slide 7

Slide 7 text

DEMO 1. Collaborative software development, 2. Collaborative writing papers/grants, 3. Collaborative conversations.

Slide 8

Slide 8 text

TYPICAL WORKFLOW

Slide 9

Slide 9 text

C0 production C1 origin/master

Slide 10

Slide 10 text

C0 production C1 origin/master iss53

Slide 11

Slide 11 text

C0 production C1 origin/master iss53 C2

Slide 12

Slide 12 text

C0 production C1 origin/master iss53 C2 C3

Slide 13

Slide 13 text

C0 production C1 origin/master iss53 C2 C3 iss102

Slide 14

Slide 14 text

C0 production C1 origin/master iss53 C2 C3 iss102 C4

Slide 15

Slide 15 text

C0 production C1 origin/master iss53 C2 C3 iss102 C4

Slide 16

Slide 16 text

git mergetool git difftool Git extras

Slide 17

Slide 17 text

Thank you How did we live before Git and GitHub? Alex Townsend Assistant Professor Math Department [email protected]