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
430
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
ライブ配信サービスの インフラのジレンマ -マルチクラウドに至ったワケ-
mirrativ
1
230
『リコリス・リコイル』に学ぶ!! 〜キャリア戦略における計画的偶発性理論と変わる勇気の重要性〜
wanko_it
1
530
TROCCO×dbtで実現する人にもAIにもやさしいデータ基盤
nealle
0
230
iOS開発スターターキットの作り方
akidon0000
0
250
MCP連携で加速するAI駆動開発/mcp integration accelerates ai-driven-development
bpstudy
0
300
GitHub Copilotの全体像と活用のヒント AI駆動開発の最初の一歩
74th
7
2.9k
No Install CMS戦略 〜 5年先を見据えたフロントエンド開発を考える / no_install_cms
rdlabo
0
480
React 使いじゃなくても知っておきたい教養としての React
oukayuka
18
5.7k
AIレビュアーをスケールさせるには / Scaling AI Reviewers
technuma
2
200
変化を楽しむエンジニアリング ~ いままでとこれから ~
murajun1978
0
730
可変性を制する設計: 構造と振る舞いから考える概念モデリングとその実装
a_suenami
10
1.8k
プロダクトという一杯を作る - プロダクトチームが味の責任を持つまでの煮込み奮闘記
hiliteeternal
0
460
Featured
See All Featured
KATA
mclloyd
32
14k
The MySQL Ecosystem @ GitHub 2015
samlambert
251
13k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
tammyeverts
8
460
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
50
5.5k
Making the Leap to Tech Lead
cromwellryan
134
9.5k
For a Future-Friendly Web
brad_frost
179
9.9k
Unsuck your backbone
ammeep
671
58k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
32
1.4k
The Language of Interfaces
destraynor
159
25k
[RailsConf 2023] Rails as a piece of cake
palkan
56
5.8k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
kevinliebholz
34
6k
How to train your dragon (web standard)
notwaldorf
96
6.2k
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