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 實戰
Search
blue chen
September 06, 2013
How-to & DIY
8
590
Git 實戰
For g0v && angularJS Workshop 2013.09
blue chen
September 06, 2013
Tweet
Share
More Decks by blue chen
See All by blue chen
RelaJet Caption
iamblue
0
110
The future of hearing device - 聽覺領域新的機會及挑戰
iamblue
2
240
20180918-Digitime 導入MCU設計 催熟智慧語音辨識應用市場
iamblue
0
210
Pixnet hackthon - workshop
iamblue
0
100
AI 人工智慧學校分享
iamblue
0
390
Javascript -Full stack 物聯網開發
iamblue
0
120
MCS Lite 私有雲物聯網開發
iamblue
0
300
Blockchain for IoT 應用
iamblue
1
210
2017.01.16 Embedded system
iamblue
0
98
Other Decks in How-to & DIY
See All in How-to & DIY
家具家電付アパートの自室の冷蔵庫をスマートIoT化してみた!
scbc1167
0
120
骨折と入院とIoT #iotlt
n0bisuke2
1
350
GreenPAK 初心者向けハンズオン資料
aoisaya
2
520
あなたは何故コミュニティに参加するのか?
awsjcpm
1
180
The Definitive? Guide To Locally Organizing RubyKaigi
sylph01
6
1.6k
Terra Charge|普通充電器ご利用ガイドブック / Terra Charge Ordinary Charger Guidebook
contents
1
360
M5Stackを使ってSズキの魔改造モンスターマシンを作ってみた
syumme01
0
200
ModuleLLM、最前線!
anoken
0
250
JAWS-UG山梨第0回 AWSのユーザーコミュニティ支援
awsjcpm
0
180
人はなぜコミュニティとつながると幸せを感じるのか
448jp
3
310
AIお菓子ロッカー
keicafeblack
0
160
【技術カンファレンス運営の裏側】Iwaken Lab 技術好き学生の近況報告 & ことみんさんに技術カンファレンス運営の裏側を聞いちゃう会
kotomin_m
5
1.7k
Featured
See All Featured
The Success of Rails: Ensuring Growth for the Next 100 Years
eileencodes
46
7.6k
How to Think Like a Performance Engineer
csswizardry
25
1.8k
Facilitating Awesome Meetings
lara
55
6.5k
KATA
mclloyd
32
14k
Code Review Best Practice
trishagee
70
19k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
tammyeverts
8
480
Intergalactic Javascript Robots from Outer Space
tanoku
272
27k
Faster Mobile Websites
deanohume
309
31k
Making the Leap to Tech Lead
cromwellryan
134
9.5k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
131
19k
Product Roadmaps are Hard
iamctodd
PRO
54
11k
Building a Scalable Design System with Sketch
lauravandoore
462
33k
Transcript
Learning Git
YouMeb 悠邁科技 Senior Web Developer & AngularJS Guru I am
Blue
國中生活 Why git? Learning git
1. 想知道別人在昨天修改了哪些地方 2.產品有版本控管需求 3.為了參加零時政府
國中生活 github introdution Learning git
github.com
None
國中生活 git good part Learning git
1. git clone https/git@ 承接專案
1. git add . 2. git commit -am ‘bla..’ 3.
git pull 4. git push
1. git add . git status 檢查改了什麼 2. git commit
-am ‘bla..’ 3. git pull 4. git push
None
國中生活 Branch的概念 Learning git
None
1. git branch 查看所在分支 2. git checkout -b ‘test’ 新增test分支
3. git checkout test 跳到test分支去
git merge ‘分支名稱’ 把別人做的東西抓進來 But..........
直接merge會在這條線上看不到分支記錄 因此要用git merge --no-ff
你做的分支,也可以丟github git push origin ‘分支名’
國中生活 git log Learning git
HEAD^ HEAD~1 HEAD~2 HEAD~3 HEAD~4 注意!HEAD是最前面 mac : HEAD\^
git log --stat 顯示每次commit的東西
git log -p -2 顯示每次commit的東西的詳情 (程式碼,最近兩次) http://git-scm.com/book/zh/Git-%E5%9F%BA%E7%A1%80-%E6%9F%A5%E7%9C %8B%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2
國中生活 當然...你也可以客製化git log Learning git
git log --graph -- pretty=format:'%s - %Cred %h%Creset %Cgreen(%cr) %Creset
%an' --abbrev- commit --date=relative try that: https://hisea.me/p/git-log-output-formats
國中生活 使用上述常見問題 Learning git
從別人那邊clone,卻推不上github
1. vim .git -> 選擇config 檢查⼀一下路徑
conflict ?!
我要還原!! git reset --hard HEAD(版本)
盡量少用rebase ,reset 請用開分支的方式還原某階段的commit http://ihower.tw/git/rebase.html
阿!!!.... commit 註解寫錯了怎麼辦?
先reset到那個版本,再改commit 1. git reset --soft HEAD\^ 2. git commit -a
-c ORIG_HEAD
git cherry-pick ‘commit 代碼’ 我要不要合併branch 只要合併commit? git cherry-pick -n ‘commit
代碼’
國中生活 git flow / feature branch Learning git
http://blog.wu-boy.com/2011/03/git-%E7%89%88%E6%9C%AC%E6%8E %A7%E5%88%B6-branch-model-%E5%88%86%E6%94%AF %E6%A8%A1%E7%B5%84%E5%9F%BA%E6%9C%AC%E4%BB%8B %E7%B4%B9/ http://nvie.com/posts/a-successful-git-branching-model/ 實戰ref: See:
THANKYOU. FOR YOUR ATTENTION www.facebook.com/iambluechen