Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git and Github: Tips and tricks
Search
Wendy Liu
November 26, 2013
Programming
2
390
Git and Github: Tips and tricks
Presentation for HackMcGill. Intro to Git/Github plus various tips and tricks, all in one.
Wendy Liu
November 26, 2013
Tweet
Share
More Decks by Wendy Liu
See All by Wendy Liu
Git and Github: Version control for a happier you
dellsystem
0
320
Optimising your JavaScript
dellsystem
1
530
Git and Github: version control for the 21st century
dellsystem
1
300
Django: The web framework for perfectionists with deadlines
dellsystem
0
420
Git and GitHub: an introduction
dellsystem
2
260
What's in a name? Using first names as features for gender inference in Twitter
dellsystem
1
450
diva.js: A web-based document viewer for high-resolution images
dellsystem
0
360
Other Decks in Programming
See All in Programming
Haskell でアルゴリズムを抽象化する / 関数型言語で競技プログラミング
naoya
17
4.9k
Bytecode Manipulation 으로 생산성 높이기
bigstark
2
380
Blazing Fast UI Development with Compose Hot Reload (droidcon New York 2025)
zsmb
1
210
iOSアプリ開発で 関数型プログラミングを実現する The Composable Architectureの紹介
yimajo
2
210
CursorはMCPを使った方が良いぞ
taigakono
1
170
地方に住むエンジニアの残酷な現実とキャリア論
ichimichi
5
1.3k
ニーリーにおけるプロダクトエンジニア
nealle
0
470
たった 1 枚の PHP ファイルで実装する MCP サーバ / MCP Server with Vanilla PHP
okashoi
1
190
データの民主化を支える、透明性のあるデータ利活用への挑戦 2025-06-25 Database Engineering Meetup#7
y_ken
0
320
エラーって何種類あるの?
kajitack
5
310
A2A プロトコルを試してみる
azukiazusa1
2
1.1k
なぜ「共通化」を考え、失敗を繰り返すのか
rinchoku
1
510
Featured
See All Featured
YesSQL, Process and Tooling at Scale
rocio
173
14k
Embracing the Ebb and Flow
colly
86
4.7k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
3.9k
GraphQLとの向き合い方2022年版
quramy
48
14k
Building Applications with DynamoDB
mza
95
6.5k
Site-Speed That Sticks
csswizardry
10
660
Visualization
eitanlees
146
16k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
124
52k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
31
1.2k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
181
53k
Making Projects Easy
brettharned
116
6.3k
BBQ
matthewcrist
89
9.7k
Transcript
HackMcGill :: January 29, 2014 tips & tricks and :
about me - Wendy Liu - 4th year Math &
CS - 3 years experience with Git - 137-day Github commit streak - dellsystem on Twitter, Github, IRC
what is git?
what is git? version control system!
svn/perforce: local vs. remote comparison to other systems
svn/perforce: local vs. remote hg/bzr: faster, more control comparison to
other systems
svn/perforce: local vs. remote hg/bzr: faster, more control cvs/rcs: no
comparison comparison to other systems
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
report_v1.doc report_v2.doc report_v3.doc report_v4.doc
keeps track of changes enter git.
keeps track of changes extremely flexible enter git.
keeps track of changes extremely flexible developed by linus torvalds
enter git.
keeps track of changes extremely flexible developed by linus torvalds
completely free to use (and open source!) enter git.
keeps track of changes extremely flexible developed by linus torvalds
completely free to use (and open source!) primarily command-line enter git.
website what is github?
website collaborative coding, via git what is github?
website collaborative coding, via git (mostly) free to use what
is github?
website collaborative coding, via git (mostly) free to use major
part of developer ecosystem (esp. OSS) what is github?
why git?
why git? diffs
why git? diffs backups
why git? diffs backups collaboration
what git can do for you versioning easy collaboration blame
tracking down bugs safe experimentation statistics
what github can do for you issue-tracking even easier collaboration
remote backups access your files from anywhere graphical, easy-to-use UI
now: how git works
repository directory on filesystem just metadata (changes) manual grouping of
changes
commit group of logically-related changes 1 or more files (add/delete/modify)
staging index CHANGES I WANT IN MY NEXT COMMIT ALL
THE OTHER CHANGES
git commit -m 'test' CHANGES I WANT IN MY NEXT
COMMIT ALL THE OTHER CHANGES a new commit, with message 'test'
CHANGES I WANT IN MY NEXT COMMIT ALL THE OTHER
CHANGES the commit with message 'test' (nothing here yet)
your computer REMOTE REPOSITORIES LOCAL REPOSITORY some server another server
github
now: git tips
rebasing git rebase -i [start commit] reorder, reword, edit, squash
commits
amending git commit --amend staged changes become part of previous
commit
force pushing git push origin master -f useful after amending/rebasing
multiple remotes git remote add origin [url] git remote add
upstream [different URL] useful when pulling from other developers
patch git add --patch stage one chunk at a time
diffing git diff (unstaged) git diff --cached (staged) git diff
--check (whitespace errors)
colours git config --global color.ui auto
fix your whitespace git stripspace git apply --whitespace=fix
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
bisect git bisect (or, "when did this bug first appear?")
ignoring .gitignore (untracked files) git update-index --assume-unchanged (tracked files) git
status --ignored
better pulls git pull vs git fetch & git merge
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
fixing merge conflicts 1. Don't panic 2. git status 3.
Look for the <<< 4. Stage & commit
moving files git mv [source] [destination] instead of: mv [source]
[destination] git rm [source] git add [destination]
sensitive data help.github.com/articles/remove-sensitive-data
selective staging git add --update (only tracked files) git add
--all (all files)
view configuration git config --list
pushing to remotes git push origin master git push origin
localbranch:remotebranch git push origin :remotebranch (deletes it)
branch tracking git push origin master -u git push origin
local:remote -u
stashing edits git stash git stash apply git stash pop
(applies, then removes from stack)
fixing mistakes git checkout (undo edits) git reset --soft (keeps
edits) git reset --hard (loses edits)
merge strategies git merge --strategy=[strategy] strategies: recursive (default), ours, theirs,
etc
now: github tips
keyboard shortcuts press ? to bring up the help
issues in commits "Fix #54" -> closes issue #54 from
the commit "For #54" -> links to #54 from commit, & vice versa
all from your browser edit, commit, send a pull request
... all without leaving your browser
blame who introduced this line, and when, and why
file rendering markup, geoson, csv, and more
integration with travis continuous integration (automated testing)
thanks! git-scm.com/book help.github.com