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
Search
高見龍
May 08, 2013
Technology
5
600
Git and Github
高見龍
May 08, 2013
Tweet
Share
More Decks by 高見龍
See All by 高見龍
AI 時代的程式語言學習法
eddie
0
32
前端模組解放運動 - importmap
eddie
0
1.1k
Git 和 DevOps - 在混亂的流星群開發流程中找到小確幸
eddie
1
1.1k
模組化前端開發:從亂七八糟到組織有序
eddie
0
1.4k
被 Vue 框架耽誤的建置工具
eddie
1
900
開開心心寫測試,你的程式碼也會微笑
eddie
1
1.2k
Functional Ruby
eddie
0
240
閱讀原始碼 - 再戰十年的 jQuery
eddie
1
730
Learn JavaScript Well
eddie
1
1.2k
Other Decks in Technology
See All in Technology
Binary Authorizationと友達になろう / Let's be friends with Binary Authorization
iselegant
2
140
Oracle Exadata Database Service(Dedicated Infrastructure):サービス概要のご紹介
oracle4engineer
PRO
0
9.4k
なぜクラウドサービスで Web コンソールを提供するのか
shuta13
4
2k
Cloud Service Mesh への期待が止まらない!!
phaya72
2
180
タイミーのBraze活用 ~PUSH通知を活用したレコメンド~
ozeshun
2
150
React Aria で実現する次世代のアクセシビリティ
ryo_manba
4
950
EitherT_with_Future
aoiroaoino
1
920
ロリポップ! for Gamersを支えるインフラ/lolipop for gamers infrastructure
takumakume
0
100
waitany と waitall を作った話
mrkn
0
120
分野に潜むツールの紹介
pojiro
1
350
PlaywrightによるE2Eテスト入門 / Introduction to E2E Testing with Playwright
rhumie
3
1k
疎通2024
sadnessojisan
5
870
Featured
See All Featured
The World Runs on Bad Software
bkeepers
PRO
64
11k
Creating an realtime collaboration tool: Agile Flush - .NET Oxford
marcduiker
22
1.7k
Clear Off the Table
cherdarchuk
90
320k
Agile that works and the tools we love
rasmusluckow
327
20k
Rebuilding a faster, lazier Slack
samanthasiow
78
8.5k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
Building an army of robots
kneath
302
42k
The Invisible Customer
myddelton
119
13k
The Mythical Team-Month
searls
218
43k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
123
18k
Designing the Hi-DPI Web
ddemaree
278
34k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
246
1.3M
Transcript
Git and Github eddiekao@NCKU
None
Current Status 80% iOS app, 20% Ruby/Rails
Before we start..
You may create lots of files day by day..
edit them, save, edit them, and save.. x N
Backup?
Ctrl-C + Ctrl-V
"ProjectA" -> "ProjectA20130506" -> "ProjectA20130508-1" -> "ProjectA20130508-2" -> "ProjectA-bak" ->
"ProjectA-forEddie"
backup and sync on LAN
Version Control
Subversion (SVN)
but the problem is..
when network or svn server is down..
Is there any better way..?
Git
What's Git?
Version Control System (VCS)
created by Linus Torvalds for managing Linux kernel source code
in 2005
distributed
remote, and also local
Git
Git != Github
Why version control?
backup just like you can load saving data while playing
RPG game
history and evidence you know whom to blame when something
is going wrong :)
Why Git?
free
fast & smaller footprint
http://git-scm.com/book/en/Getting-Started-Git-Basics some other version control system..
http://git-scm.com/book/en/Getting-Started-Git-Basics git
just snapshots, not differences
local commit and remote push
most of the operations are local
easy to co-work with others
But..
git is easy to use, but hard to master
Install Git
on Mac: > brew install git on Ubuntu or some
linux OS: > sudo apt-get install git-core or > sudo apt-get install git
Exercise: please install git in your machine.
How to Git
configurations
.gitconfig it should locate in your home directory
set your username and email > git config --global user.name
"eddie" > git config --global user.email "
[email protected]
" list all settings > git config --list
make some useful aliases
[alias] co = checkout br = branch aa = add
--all l = "!source ~/.dotfiles/.githelper && pretty_git_log" https://github.com/kaochenlong/eddie-dotfiles
Exercise: 1. set your username and email for git. 2.
edit the ".gitconfig" and add some aliases.
.gitignore https://github.com/github/gitignore
don't be afraid of command line tools
git init
Exercise: please create a new directory and initialize for git
version control.
git clone
git clone git://github.com/kaochenlong/eddie-vim.git
Exercise: please try to copy a project from Github or
somewhere to your local machine.
working, staging, and repository
http://git-scm.com/about/staging-area
git add can add a single file or all modified
files, even a single line.
Exercise: add a new file named "hello.rb" and add to
staging area.
Exercise: after adding "hello.rb" to staging area, then try to
modify it and see what happen?
git status
Exercise: try to check if "hello.rb" is in staging area,
and then remove it from staging area.
git mv
Exercise: add "hello.rb" to staging area, and then rename it
to "world.rb".
git commit
Exercise: just commit it :)
When to make a Commit?!
commit message matters!
amend committed message
git commit --amend
Exercise: you just committed with a rubbish message, pleases amend
it to make sense for your project.
Exercise: in last commit, you forgot to add another file,
but you don't want to commit again just for this single file, please try to commit it with -- amend.
Notice: empty folder won't be committed!
if you still want to commit an empty folder, you
can put an empty “.gitkeep” file in it by convention.
git log
git log --pretty=oneline
git log --pretty=format:"%h %s"
git help log
Exercise: check your commit log
Exercise: read the help manual of “git log”, and make
your prefer log format.
Exercise: modify something in the "world.rb" then commit again.
git rm
Exercise: remove a file and then checkout it back.
git tag
tag is a milestone
Exercise: create a tag for your project
git branch
branching is very cheap
When to make a Branch?!
git checkout
Exercise: 1. create a new branch name "fruit" 2. checkout
to "fruit" branch 3. add a "banana.rb" and commit it
Exercise: please try to list all branches, including local and
remote branches.
Exercise: you accidentally delete the "world.rb" file, please try to
recover it with git commands.
Exercise: you just create a tag name “ncku”, try to
checkout to this tag after several commits.
git merge
conflict?
Exercise: 1. checkout back to "master" branch 2. merge "fruit"
to "master" 3. remove "fruit" branch if you like
git reset soft v.s. hard
Exercise: reset a file to untracked status which you just
added to staging.
Exercise: you just merged a branch, please try reset it
to back to un-merged branch.
git pull
git pull = git fetch + git merge
git push
git push origin ncku-branch
git clean remove untracked files
git stash apply, pop, list, clear
git remote
Reading References
1. Pro Git 2. ihower's blog http://ihower.tw/git/
Git Flow
http://git-scm.com/book/en/Git-Branching-Branching-Workflows
http://nvie.com/posts/a-successful-git-branching-model/
on Mac: > brew install git-flow on Ubuntu or some
linux OS: > sudo apt-get install git-flow https://github.com/nvie/gitflow/wiki/Installation
Exercise: please install git flow in your machine, and initialize
a git flow project.
init a project with git flow > git flow init
Branches Master, Develop, Feature, Release, Hotfix
add a new feature: > git flow feature start my_new_feature
when done with the new feature: > git flow feature finish my_new_feature
Exercise: your boss ask you to add a new feature
which can let user upload their photos, please try to finish this assignment in git flow.
Exercise: your boss find a bug and ask you to
fix it ASAP, please try to do this assignment in git flow.
Github
What's Github?
a git repository server
coders' facebook :)
None
make friends with other awesome coders :)
resume for coders!
Free? Price?
SSH/HTTPS/GIT
How to Github?
Exercise: register a new account on Github
without password?
SSH Key
Exercise: generate a SSH key pair in your local machine
and add the public key to Github
Exercise: create a new repository on Github
git push
Exercise: upload your project to Github
Exercise: 1. clone a project from Github 2. do some
changes 3. commit and push back to Github
Exercise: 1. create a new local branch 2. add some
change and then push this branch to Github
tag won't be pushed to repo by default
push a tag: > git push origin v2.0 push several
tags: > git push origin --tags
Exercise: create some tags for your project and upload them
to Github
git pull
Fork
Pull Request
Exercise: 1. fork a project from your classmate who is
sitting just next to you. 2. add some change and commit. 3. fire a pull request.
Github Pages
host static files for FREE
upload files via git commands
User pages kaochenlong.github.io
Project Pages gh-pages branch
custom domain name
Exercise: 1. create a github page for your account. 2.
set your domain name in CNAME if you have one.
something else?
bitbucket free private repo
git + dropbox
What's inside the .git folder?