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
380
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
310
Optimising your JavaScript
dellsystem
1
510
Git and Github: version control for the 21st century
dellsystem
1
290
Django: The web framework for perfectionists with deadlines
dellsystem
0
390
Git and GitHub: an introduction
dellsystem
2
250
What's in a name? Using first names as features for gender inference in Twitter
dellsystem
1
420
diva.js: A web-based document viewer for high-resolution images
dellsystem
0
340
Other Decks in Programming
See All in Programming
Amazon Q Developer Proで効率化するAPI開発入門
seike460
PRO
0
110
ASP. NET CoreにおけるWebAPIの最新情報
tomokusaba
0
360
Open source software: how to live long and go far
gaelvaroquaux
0
620
Immutable ActiveRecord
megane42
0
130
昭和の職場からアジャイルの世界へ
kumagoro95
1
350
SpringBoot3.4の構造化ログ #kanjava
irof
2
970
なぜイベント駆動が必要なのか - CQRS/ESで解く複雑系システムの課題 -
j5ik2o
7
2.5k
DROBEの生成AI活用事例 with AWS
ippey
0
130
2024年のkintone API振り返りと2025年 / kintone API look back in 2024
tasshi
0
210
Formの複雑さに立ち向かう
bmthd
1
720
第3回関東Kaggler会_AtCoderはKaggleの役に立つ
chettub
3
890
AWSマネコンに複数のアカウントで入れるようになりました
yuhta28
2
160
Featured
See All Featured
Unsuck your backbone
ammeep
669
57k
Thoughts on Productivity
jonyablonski
69
4.5k
Site-Speed That Sticks
csswizardry
3
370
Building Your Own Lightsaber
phodgson
104
6.2k
Mobile First: as difficult as doing things right
swwweet
223
9.3k
Music & Morning Musume
bryan
46
6.3k
The Language of Interfaces
destraynor
156
24k
Learning to Love Humans: Emotional Interface Design
aarron
273
40k
Raft: Consensus for Rubyists
vanstee
137
6.8k
[RailsConf 2023 Opening Keynote] The Magic of Rails
eileencodes
28
9.3k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
33
2.8k
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