Use Git to Control Your Life

➃欰♶腋ꅾ⢵ ⡎(JU〳⟃ 넞鋅륌

a.k.a Eddie 3VCZ3BJMTJ04BQQꟚ涮罏闍䌌 3VCZ䪮遯䲀䑞來肬镪鑉〵抓傈劥3VCZ䪮遯灇鎣剚闍罏湡⵹倴❀⦔秋㼂瀖二⟤秋㼂瀖Ꙥ㹁㉂耷⹡ 鿈衆呔IUUQLBPDIFOMPOHDPN 넞鋅륌 photo by
Eddie !FEEJFLBP

photo by Eddie 傈劥3VCZ钢阮Ꟛ涮罏 "EPCF⾲䑖钢阮'MBTIꟚ涮罏 -JOVY-1*㕜ꥹ钢阮
❀⦔秋㼂瀖Ⱏずⶾ鳵➃ 〵抓8FC$POG1)1$POG涮饱➃ 3BJMT(JSMT5BJQFJ涮饱➃ 155'MBTI晝晝⚺ a.k.a Eddie 넞鋅륌 !FEEJFLBP

❀⦔秋㼂瀖 IUUQYSVCZUX

❀⦔秋㼂瀖 IUUQYSVCZUXFWFOUTTQBDF

Ꟛ㨥⛓⵹

⡹〳腋嫦㣔剚䒊用䖎㢵涸墂呪

管鱀㶸墂管鱀㶸墂Y/

⡹䙦랃⨞墂呪⪔⟨ ㉏겗

剓矦⤑⛳剓搂侰涸  醳醢顦♳ $USM$ $USM7

1SPKFDU"1SPKFDU" 1SPKFDU" 1SPKFDU" 1SPKFDU"CBL 1SPKFDU"GPS&EEJF

䙲劥堥炽焈㡏䱈   ⪔⟨ⵌ笪騟蔊ꁈ㽠㥪㉻

晝劥䱾ⵖ 7FSTJPO$POUSPM

➊랃晝劥銴䱾ⵖ➊랃 ㉏겗

⪔⟨ 㽠⫹梖麉䨡涸儘⦬剚⮭㶸麉䨡鹎䏞♧垺

娜〷私ꏗ⿻阮亙 ⴀ✲涸儘⦬⡹剚濼麥僽䖰➊랃儘⦬Ꟛ㨥㽠剤㉏겗 ⟃⿻濼麥鑪䪪铪⢵縰

$PODVSSFOU7FSTJPOT4ZTUFN $74 TJODF

4VCWFSTJPO 47/

㉏겗僽

㥶卓尝剤笪騟䧴僽47/涸⠿ 剪㐼佦ꥻ涸儘⦬⤑搂岁⢪欽

➊랃僽(JU

(JU⛳僽♧珏晝劥䱾ⵖ禺窡

鏤鎙罏-JOVT5PSWBMET GPSNBOBHJOH-JOVYLFSOFMTPVSDFDPEFJO

㉏)PXEJEZPVBQQSPBDIJU %JEZPVTUBZVQBMM XFFLFOEUPXSJUFJUPSXBTJUKVTUEVSJOHSFHVMBSIPVST 5PSWBMET*UUPPLBCPVUBEBZUPHFUUPCFTFMG IPTUJOHTPUIBU*DPVMETUBSUDPNNJUUJOHUIJOHTJOUP HJUVTJOHHJUJUTFMG IUUQTXXXMJOVYDPNCMPHZFBSTHJUJOUFSWJFXHJUDSFBUPSMJOVTUPSWBMET

ⴕ侕䒭

黇畮劥㖒乽⡲涼〳㣐鿈⟨涸乽⡲鿪僽劥㖒畮涸

HJU䧮濼麥植㖈䊨玑䌌⦛鿪铞㖈齡⦐HJUIVC➊랃涸㉏겗

(JU(JUIVC

⮛럊

Ꟛ彂⯝顥

鸠䏞䘰墂呪㼭

ず儘佅䴂劥㖒⿻黇畮乽⡲

㺂僒莅Ⱖ㸐➃Ⱏず⼿⡲

⡎僽

(JU僽♧珏僒㷸ꨈ礶涸䊨Ⱘ

岁⵱  涸HJU䭸⟂㽠駈⟃䥰➰䎂傈涸䊨⡲

㸞酤(JU

Mac: $ brew install git Ubuntu or some linux OS:
$ sudo apt-get install git-core or $ sudo apt-get install git

IUUQTDJP

箻绢锞㖈⡹涸ꨶ舡♳㸞酤(JU

Ꟛ㨥⢪欽(JU

鏤㹁

增鋕湡⵹鏤㹁 $ git config --list 鏤㹁VTFSOBNF⿻FNBJM $ git config --global
user.name "eddie" $ git config --global user.email "[email protected]"

_HJUDPOH

刿倰⤑涸鏤㹁

IUUQTHJUIVCDPNLBPDIFOMPOHFEEJFEPUMFT [alias] co = checkout br = branch aa =
add --all ⤑ⵄ涸鏤㹁

箻绢鏤㹁⡹涸⢪欽罏そ珖⿻FNBJM

♶銴㹳䙲畮穅堥䧴䭸⟂垸䒭  ➫稣溏㸐涸鱒ⴀ穡卓

倞㟞ⴲ㨥3FQPTJUPSZ

䒊用湡ꏗ $ mkdir demo ⴲ㨥⻋ $ cd demo $ git
init Initialized empty Git repository in / private/tmp/demo/.git/

練習: 建⽴立⼀一個新的⺫⽬目錄，並且初始化它

8PSLJOH 4UBHJOH BOE3FQPTJUPSZ

IUUQHJUTDNDPNBCPVUTUBHJOHBSFB

䧮倞㟞⥜佖✫♧❉墂呪 銴䙦랃欽(JU⢵盘椚朜屣

䪾墂呪佞ⵌ(JU酭

倞㟞墂呪JOEFYIUNM $ touch index.html ⸈ⵌTUBHJOH $ git add index.html

箻绢倞㟞♧⦐そ捀JOEFYIUNM涸墂呪⚛㟞㶸佞荛TUBHJOHBSFB

䧮銴䙦랃濼麥湡⵹(JU涸盘椚朜屣朜屣

叆溏朜䢀

叆溏朜䢀 $ git status Initial commit Changes to be committed:
(use "git rm --cached <file>..." to unstage) new file: index.html

箻绢鑑衽䪾佞㖈TUBHJOHBSFB涸JOEFYIUNM 佖㔐⾲⢵涸朜䢀䲿爚HJUSNDBDIFE

HJUBEE⛓䖕㽠皿㸤䧭㶸墂✫㌨㉏겗

䲿❜$PNNJU

䲿❜ $ git commit -m "add index.html" [master (root-commit) cb96971]
add index.html 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 index.html

♶䟝欽갸鏤涸管鱀㐼 emacs: $ git config --global core.editor emacs  sublime
text: $ git config --global core.editor "subl -n -w" atom: $ git config --global core.editor "atom --wait"

箻绢 KVTUDPNNJUJU

➊랃儘⦬銴DPNNJU ㉏겗

鎝䜂䖎ꅾ銴

麂ⵌ慍㹐⨞䖤䖎♶晊㔔捀䗱䞕♶㥪♶㼭䗱㖈DPNNJU鎝䜂縰✫㹐䨩✫銴䙦랃嶋䱈朜屣

⥜佖剓䖕♧妄DPNNJU $ git commit --amend

箻绢 ⡹ⶍⶍ♶㼭䗱㖈䲿❜涸鎝䜂酭縰✫ 㹐䨩䟝鳵岁䪾鸏⦐㉏겗⥜姻ゅ

ⶍⶍ㸤䧭DPNNJU⡎涮植剤♧ ⦐墂呪䘎✫⸈ⵌ⿶♶䟝捀✫鸏 ⦐墂呪ꅾ倞ⱄ涮♧妄DPNNJU 朜屣

䪾DPNNJU⢘ⵌ♳♧妄涸DPNNJU $ git add hello.rb  $ git commit --amend -m
"update file and add hello.rb"

箻绢㖈剓鵜♧妄涸䲿❜⚥⡹怪✫♧⦐ 墂呪⡎⡹⿶♶䟝ⱄ㔔姽㟞⸈♧妄䲿❜侸鑑衽欽BNFOE⢵䪾墂呪 ⸈ⵌ♳妄涸䲿❜酭

䧮ⶍⶍ倞㟞✫♧⦐JNBHFT湡 ꏗ⡎⽿涮植鸏⦐湡ꏗ㥪⫹尝鳵岁鄄⸈ⵌHJU酭꬗ 朜屣

岤䠑✲갪 瑠涸湡ꏗ搂岁鄄䲿❜

㥶卓⡹鼩僽䟝銴䲿❜♧⦐瑠涸湡ꏗ 〫銴ꦑ⤑佞⦐瑠涸墂呪㖈酭꬗㽠遤 ✫䢫⢿♳剚佞⦐そ捀LFFQ䧴 HJULFFQ涸瑠涯墂呪

箻绢䒊用瑠涸须俲㣰⚛㖈酭꬗佞♧⦐ 瑠墂呪⚛㸤䧭䲿❜

䧮濼麥䙦랃DPNNJU✫⡎銴䙦 랃溏⛓⵹DPNNJU涸穡卓朜屣

增鋕䲿❜私ꏗ $ git log commit cb96971765877246f4019e6771fd12d541c951e7 Author: Eddie Kao <[email protected]>
Date: Sat Apr 16 07:34:21 2016 +0800 add index.html

增鋕䲿❜私ꏗ ♧遤礶矦晝 $ git log --graph --oneline * cb96971 add
index.html

箻绢增鋕♧♴⡹涸䲿❜私ꏗ

㥶卓䧮〫䟝銴溏厥⦐墂呪涸娜〷私ꏗ 朜屣

$ git log -p FILENAME 增鋕㋲♧墂呪涸娜〷私ꏗ

瘞瘞➊랃儘⦬剤鸏♧遤玑䒭焺鸏♧遤铪㻨涸朜屣

$ git blame FILENAME 增鋕嫦遤玑䒭焺涸私ꏗ

♶㼭䗱䪾厥⦐墂呪䧴湡ꏗⵅ䱈 ✫ 朜屣

雊墂呪䧴湡ꏗ㔐ⵌ剓鵜♧妄涸DPNNJU 涸朜䢀 $ git checkout hello.rb $ git checkout .
雊殹⵹湡ꏗ㔐ⵌ剓鵜♧妄涸DPNNJU涸朜䢀

箻绢鑑衽䪾厥⦐墂呪䧴湡ꏗⵅꤑⱄ欽 HJUDIFDLPVU䭸⟂佹㔐⢵

ⶍⶍDPNNJU✫剤럊䖕䜼䟝銴ⱄ佖럊匌銯ⱄꅾ倞DPNNJU 朜屣

《嶋剓䖕♧妄䲿❜ TPGU $ git reset HEAD^ $ git reset HEAD^
--hard 《嶋剓䖕♧妄䲿❜ IBSE

雊湡⵹涸湡ꏗ㔐ⵌ♳♧妄涸DPNNJU $ git checkout . $ git clean -f $
git clean -df # d = 清除⺫⽬目錄幢ꤑVOUSBDL朜䢀涸墂呪

箻绢鑑衽䪾《嶋剓䖕♧妄涸䲿❜

䧮剚DPNNJU✫齡䧮㽠♧騟 DPNNJUⵌ䏁㽠遤✫ゅ㉏겗

ⴕ佅

ⴕ佅䖎⤑㹆涸

➊랃儘⦬銴Ꟛⴕ佅

倞㟞ⴕ佅DBU $ git branch cat 增鋕ⴕ佅 $ git branch cat
* master $ git branch -D cat Deleted branch cat (was cb96971). ⵅꤑⴕ佅DBU

ⴗ䳖ⴕ佅ⵌDBU $ git checkout cat ⴗ䳖ⵌEPHⴕ佅㥶卓♶㶸㖈剚荈 ⹛䒊用ⴕ佅 $ git checkout
-b dog

箻绢䒊用ⴕ佅そ珖GSVJU ⴗ䳖ⵌGSVJUⴕ佅倞㟞墂呪CBOBOBIUNM⚛⚂㸤䧭䲿❜

ざ⢘ⴕ佅

ざ⢘ⴕ佅DBU $ git checkout master $ git merge cat

箻绢 ⴗ䳖㔐NBTUFSⴕ佅ざ⢘GSVJUⴕ佅ⵌNBTUFS ⵅꤑGSVJUⴕ佅㥶卓♶䟝殆涸鑨

䧮溏剤❉➃涸ⴕ佅鿪剤溏饱⢵⫹ ⴕ佅涸չ㼭羮労պ箁㕮羳䙦랃 䧮涸ⴕ佅鿪尝剤朜屣

$ git merge cat --no-ff ꬌ䘰鱲ざ⢘

ざ⢘麕涸ⴕ佅銴殆衽㌨㉏겗

$ git branch --merged 增鋕䊺竤ざ⢘麕涸ⴕ佅

娜〷私ꏗ〳⟃⥜佖㌨㉏겗

⥜佖䲿❜

⥜佖䲿❜ $ git rebase -i cb96971 # p, pick =
use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell

涮欰遼瑳 $POJDU ✫䙦랃鳵㉏겗

剤溏ⵌⴽ➃涸鮿넓剚铞➊랃 涸齡⦐騈HJU剤ꡠ⤚㌨朜屣

標籤

⾥里程碑

倞㟞垦硹 $ git tag 1.0.0 $ git tag 增鋕垦硹

箻绢锞倞㟞♧⦐CFUB涸垦硹

䧮濼麥䙦랃㖈荈䊹ꨶ舡欽HJU ✫⡎銴䙦랃♳⫄ⵌHJUIVC騈 ⴽ➃Ⱏ欽朜屣

黇畮乽⡲

黇畮眏럊

倞㟞黇畮眏럊 $ git remote add origin [email protected]:kaochenlong/dummy- git.git $ git
remote rm origin ⵅꤑ黇畮眏럊

增鋕黇畮眏럊 $ git remote -v origin [email protected]:kaochenlong/dummy-git.git (fetch) origin [email protected]:kaochenlong/dummy-git.git
(push)

♳⫄1VTI

♳⫄ $ git push origin master $ git push origin
cat ♳⫄DBUⴕ佅ⵌPSJHJO眏럊

ⵅꤑ黇畮DBUⴕ佅 $ git push origin :cat

♴鯺刿倞1VMM

♴鯺 $ git pull origin master

HJUQVMMHJUGFUDI HJUNFSHF

䖰⠿剪㐼♳《䖤3FQPTJUPSZ

《䖤3FQPTJUPSZ $ git clone git://github.com/ kaochenlong/eddie-vim.git

鍑对遼瑳 DPOJDU

HJU涸QVMM僽♴鯺DMPOF㥪⫹ ⛳僽♴鯺剤♶♧垺㌨朜屣

⡹䩛鼹涸䊨⡲⨞ⵌ♧⼱罉꠸չ齡⦐铪铪铪笪畀䱦✫ ⡹馜䘰⯓⢵⥜♧♴鸏⦐⸆腋պ 朜屣

䪾湡⵹朜屣㶸♴⢵ $ git stash save $ git stash apply 䪾剓䖕♧妄涸TUBTI䭭ⴀ⢵欽
$ git stash drop ⵅꤑ剓䖕♧妄涸TUBTI

Ⱖ㸐朜屣

剤❉嫲鯱堥㺙涸墂呪䧮♶䟝佞㖈 HJU酭꬗♧饱⪔⟨ 朜屣

HJUJHOPSF https://github.com/github/gitignore

⡹♶㼭䗱䪾䌙贫㺙焺㻨㖈厥⦐墂呪酭䲿❜罜⚂䲀ⴀ⿡✫ 朜屣

$ git filter-branch --tree-filter "rm -f config/password.txt" ꆚ㼩嫦⦐眏럊ⵅꤑ暶㹁墂呪

⡹姻㖈EFWFMPQⴕ佅鹎遤厥⦐ ꐫ铐涸⥜姻⡎⡹瑳搭涮植鸏⦐ ꐫ铐㖈厥⦐ⴕ佅涸厥⦐DPNNJU 䊺竤⥜麕✫ 朜屣

ざ⢘厥⦐暶㹁眏럊 $ git cherry-pick 823520ed $ git cherry-pick 823520ed --edit
ざ⢘厥⦐暶㹁眏럊⵹管鱀鎝䜂 $ git cherry-pick 823520ed --no-commit 《䖤厥⦐暶㹁眏럊Ⰹ㺂⡎♶鹎遤ざ⢘

礶牟♶㥪♶㼭䗱鱒Ⰵ✫HJU SFTFU)&"%?IBSE䭸⟂墂呪鼩佹䖤㔐⢵㌨朜屣

⵹♧㣔尝漗귄♶㼭䗱䪾鼩尝ざ ⢘涸ⴕ佅ⵅ䱈✫佹䖤㔐⢵㌨朜屣

(JUIVC

(JUIVC僽➊랃

(JU3FQPTJUPSZ4FSWFS

Ꟛ涮罏⦛涸GBDFCPPL

騈⿐㹳涸Ꟛ涮罏⦛❜剦⿼

Ꟛ涮罏剓㥪涸㾷娜

⢪欽(JUIVC

箻绢㖈(JUIVC♳鏽ⱁ䌙贫倞㟞♧⦐ 3FQPTJUPSZ⚛♳⫄⡹湡⵹涸鹎䏞

箻绢醳醢♧⟨⡹㖈(JUIVC♳Ꟛ涸㼠呪 ⨞❉⥜佖䲿❜⚛♳⫄㔐⾲⢵涸㼠呪

箻绢䒊用♧⦐倞涸劥㖒ⴕ佅㟞⸈䧴⥜佖♧❉墂呪搭䖕䪾鸏 ⦐ⴕ佅䲀♳(JUIVC

UBH갸鏤♶剚鄄QVTI♳⿡

䪾垦硹䲀♳⿡ $ git push origin 1.0.0 $ git push origin
--tags 䪾䨾剤涸垦硹䲀♳⿡

莅Ⱖ㸐Ꟛ涮罏✽⹛

'PSL1VMM3FRVFTU 13

箻绢 GPSL♧⦐㗂㖈⡹倾鼹涸齡⡙ず㷸涸㼠呪 ⨞❉矦㋲涸⥜佖涮鷑♧⦐QVMMSFRVFTU

⡹GPSL✫♧⦐HJUIVC涸㼠呪 鑪㼠呪䖕⢵㔔捀♶倬涸刿倞⡎ ⡹涸㼠呪鼩僽⨢㖈殹ⴲGPSL儘 ⦬涸朜䢀朜屣

TUFQ倞㟞⾲⢵SFQP涸黇畮眏럊 $ git remote add upstream ORIGIN_REPO $ git fetch
upstream TUFQ《䖤鑪眏럊墂呪 $ git merge upstream/master TUFQざ⢘

(JU'MPX

IUUQHJUTDNDPNCPPLFO(JU#SBODIJOH#SBODIJOH8PSLPXT

IUUQOWJFDPNQPTUTBTVDDFTTGVMHJUCSBODIJOHNPEFM

on Mac: $ brew install git-ﬂow on Ubuntu or some
linux OS: $ sudo apt-get install git-ﬂow IUUQTHJUIVCDPNOWJFHJUPXXJLJ*OTUBMMBUJPO

ⴕ佅 .BTUFS %FWFMPQ 'FBUVSF 3FMFBTF )PUY

ⴲ㨥⻋HJUPX $ git flow init

倞㟞GFBUVSFTJHO@VQ $ git flow feature start sign_up $ git flow
feature finish sign_up 㸤䧭GFBUVSFTJHO@VQ

箻绢鑑衽⢪欽(JUPX⢵倞㟞♧⦐ GFBUVSFⴕ佅 NFNCFS 㸤䧭䖕ざ ⢘㔐EFWFMPQⴕ佅

TPNFUIJOHFMTF

.git ⺫⽬目錄裡的東⻄西?

IUUQTHJUTDNDPNCPPLFOW

⾼高⾒見⻯⿓龍 Blog Facebook Twitter Email Mobile http://kaochenlong.com http://www.facebook.com/eddiekao https://twitter.com/eddiekao [email protected]
+886-928-617-687

Use Git to Control Your Life

Use Git to Control Your Life

More Decks by 高見龍

Other Decks in Technology

Featured

Transcript