Git and Github: Tips and tricks

Slide 1

Slide 1 text

HackMcGill :: January 29, 2014 tips & tricks and :

Slide 2

Slide 2 text

about me - Wendy Liu - 4th year Math & CS - 3 years experience with Git - 137-day Github commit streak - dellsystem on Twitter, Github, IRC

Slide 3

Slide 3 text

what is git?

Slide 4

Slide 4 text

what is git? version control system!

Slide 5

Slide 5 text

svn/perforce: local vs. remote comparison to other systems

Slide 6

Slide 6 text

svn/perforce: local vs. remote hg/bzr: faster, more control comparison to other systems

Slide 7

Slide 7 text

svn/perforce: local vs. remote hg/bzr: faster, more control cvs/rcs: no comparison comparison to other systems

Slide 8

Slide 8 text

backup_dec_1_2012.zip backup_dec_8_2012.zip backup_dec_15_2012.zip backup_dec_22_2012.zip backup_dec_29_2012.zip backup_jan_5_2012.zip backup_jan_12_2012.zip backup_jan_19_2012.zip backup_jan_26_2012.zip

Slide 9

Slide 9 text

report_v1.doc report_v2.doc report_v3.doc report_v4.doc

Slide 10

Slide 10 text

keeps track of changes enter git.

Slide 11

Slide 11 text

keeps track of changes extremely flexible enter git.

Slide 12

Slide 12 text

keeps track of changes extremely flexible developed by linus torvalds enter git.

Slide 13

Slide 13 text

keeps track of changes extremely flexible developed by linus torvalds completely free to use (and open source!) enter git.

Slide 14

Slide 14 text

keeps track of changes extremely flexible developed by linus torvalds completely free to use (and open source!) primarily command-line enter git.

Slide 15

Slide 15 text

website what is github?

Slide 16

Slide 16 text

website collaborative coding, via git what is github?

Slide 17

Slide 17 text

website collaborative coding, via git (mostly) free to use what is github?

Slide 18

Slide 18 text

website collaborative coding, via git (mostly) free to use major part of developer ecosystem (esp. OSS) what is github?

Slide 19

Slide 19 text

why git?

Slide 20

Slide 20 text

why git? diffs

Slide 21

Slide 21 text

why git? diffs backups

Slide 22

Slide 22 text

why git? diffs backups collaboration

Slide 23

Slide 23 text

what git can do for you versioning easy collaboration blame tracking down bugs safe experimentation statistics

Slide 24

Slide 24 text

what github can do for you issue-tracking even easier collaboration remote backups access your files from anywhere graphical, easy-to-use UI

Slide 25

Slide 25 text

now: how git works

Slide 26

Slide 26 text

repository directory on filesystem just metadata (changes) manual grouping of changes

Slide 27

Slide 27 text

commit group of logically-related changes 1 or more files (add/delete/modify)

Slide 28

Slide 28 text

staging index CHANGES I WANT IN MY NEXT COMMIT ALL THE OTHER CHANGES

Slide 29

Slide 29 text

git commit -m 'test' CHANGES I WANT IN MY NEXT COMMIT ALL THE OTHER CHANGES a new commit, with message 'test'

Slide 30

Slide 30 text

CHANGES I WANT IN MY NEXT COMMIT ALL THE OTHER CHANGES the commit with message 'test' (nothing here yet)

Slide 31

Slide 31 text

your computer REMOTE REPOSITORIES LOCAL REPOSITORY some server another server github

Slide 32

Slide 32 text

now: git tips

Slide 33

Slide 33 text

rebasing git rebase -i [start commit] reorder, reword, edit, squash commits

Slide 34

Slide 34 text

amending git commit --amend staged changes become part of previous commit

Slide 35

Slide 35 text

force pushing git push origin master -f useful after amending/rebasing

Slide 36

Slide 36 text

multiple remotes git remote add origin [url] git remote add upstream [different URL] useful when pulling from other developers

Slide 37

Slide 37 text

patch git add --patch stage one chunk at a time

Slide 38

Slide 38 text

diffing git diff (unstaged) git diff --cached (staged) git diff --check (whitespace errors)

Slide 39

Slide 39 text

colours git config --global color.ui auto

Slide 40

Slide 40 text

fix your whitespace git stripspace git apply --whitespace=fix

Slide 41

Slide 41 text

good commit messages Fix bug (50 chars max, capitalised, imperative) Longer description explaining what the commit does. Wrap at 72 characters. Don't forget the blank line. bit.ly/gitcommit

Slide 42

Slide 42 text

bisect git bisect (or, "when did this bug first appear?")

Slide 43

Slide 43 text

ignoring .gitignore (untracked files) git update-index --assume-unchanged (tracked files) git status --ignored

Slide 44

Slide 44 text

better pulls git pull vs git fetch & git merge

Slide 45

Slide 45 text

aliases git s = git status git add = git add --patch git ds = git diff --staged git amend = git commit --amend git say = git commit -m git un = reset --soft HEAD^1

Slide 46

Slide 46 text

fixing merge conflicts 1. Don't panic 2. git status 3. Look for the <<< 4. Stage & commit

Slide 47

Slide 47 text

moving files git mv [source] [destination] instead of: mv [source] [destination] git rm [source] git add [destination]

Slide 48

Slide 48 text

sensitive data help.github.com/articles/remove-sensitive-data

Slide 49

Slide 49 text

selective staging git add --update (only tracked files) git add --all (all files)

Slide 50

Slide 50 text

view configuration git config --list

Slide 51

Slide 51 text

pushing to remotes git push origin master git push origin localbranch:remotebranch git push origin :remotebranch (deletes it)

Slide 52

Slide 52 text

branch tracking git push origin master -u git push origin local:remote -u

Slide 53

Slide 53 text

stashing edits git stash git stash apply git stash pop (applies, then removes from stack)

Slide 54

Slide 54 text

fixing mistakes git checkout (undo edits) git reset --soft (keeps edits) git reset --hard (loses edits)

Slide 55

Slide 55 text

merge strategies git merge --strategy=[strategy] strategies: recursive (default), ours, theirs, etc

Slide 56

Slide 56 text

now: github tips

Slide 57

Slide 57 text

keyboard shortcuts press ? to bring up the help

Slide 58

Slide 58 text

issues in commits "Fix #54" -> closes issue #54 from the commit "For #54" -> links to #54 from commit, & vice versa

Slide 59

Slide 59 text

all from your browser edit, commit, send a pull request ... all without leaving your browser