歡迎來到 GitHub 新手村

Denny Huang

2013/10/03

Who am I ?

Denny Huang

• SITCON 2013, 2014 總召

• About me

http://hackgen.sitcon.org/

歡迎來到新手村

是否寫過程式？

小專題/中大型
專案開發經驗

版本控制經驗

Shell 熟悉程度

Git / GitHub

It's different

攻城屍的救星

版本控制

版本控制類型

本地端版本控制

集中式版本控制系統

分散式版本控制系統

整裝待發

• 成為 GitHub 帝國一員
• 已持有主要武器 Git
  • 在 Terminal 輸入 git 確認
  • sudo apt-get install git
  • sudo yum install git
• 選擇輔助武器 - 編輯器 (vim, emacs, gedit)

環境設定

git config --global user.email "[email protected]"

git config --global user.name "Your Name"

git config --global color.ui true

git config --global core.editor vim

環境設定

git config --global alias.co commit

git config --global alias.lg "log --color --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"

.gitconfig

Why --global?

Show branch names in $PS1

Halloween Bash Profile Generator

function parse_git_branch {
   git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* (.*)/(\1)/'
}


export PS1="\h:\W \u\$(parse_git_branch)$ "

開始冒險

Mission 1

Create a new repo

Reward: 10 exp

Public / Private

README.md

.gitignore

License

Mission Complete!

Mission 2

Delete the repository

Reward: 10 exp

Mission Complete!

Mission 3

Create an new repo without initialization

Reward: 10 exp

Mission Complete!

About protocol

https / ssh

Mission 4

Create a new local repository

and push to github via https

Reward: 470 exp

git help <command>

git init

touch README.md

git status

Add file to staging area

• git add README.md

• git add .

Untrack file

• git rm --cached <file>

Unstage file

• git reset <file>

Before commit

• git status

• git diff

Commit

• git commit

• git commit -m "first commit"

• git commit --amend

何時該 commit？

commit log 怎麼寫？

Show commit log

• git log

• git show <revisions>

SPECIFYING REVISIONS

Remove file

• git rm <file>

Rename file

• git mv <file>

Checkout to previous version

• git checkout <revision>

Checkout file from previous version

• git checkout <revision> <file>

Stash files

• git stash

• git stash list

• git stash pop

Reset to previous version

• git reset <revision>

• git reset --hard <revision>

Add remote repo

• git remote add origin https://github.com/denny0223/workshop.git

• git remote

• git remote show origin

Push to remote repo

• git push -u origin master

• git push origin master

• git push

• push.default

List branches

• git branch

• git branch -a

• git branch -v

• git branch -vv

Mission Complete!

Mission 5

Clone your repo via ssh

try to commit and push

Reward: 40 exp

git clone

Please make sure you have the correct access rights

and the repository exists.

Generating SSH keys

Mission Complete!

Mission 6

Pull from remote repo

Resolving conflict

Reward: 160 exp

Add a new commit at remote via https repo.

git pull

git fetch + git merge

git pull --rebase

Merge conflict

Mission Complete!

攻城屍們！繼續冒險吧！

Git Branch

A successful Git branching model

Something useful

• GitHub Pages

• git-cal

Just for fun

• gitfiti

Resources

• Pro Git

• Pro Git (zh-tw)

• 版本控制系統 Git 精要

• Git Magic

Thanks for listening!

本投影片採用創用 CC「姓名標示—相同方式分享 3.0 台灣」授權條款