Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
Про git
Search
Benjamin Tambourine
November 16, 2015
Technology
66
0
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Про git
Benjamin Tambourine
November 16, 2015
Transcript
35 slides
Про git Вениамин Тамбурин FrontendMeetup
Источники • Git Magic by Benn Lynn • Git for
Ages 4 and Up by Michael Schwern • Pro Git by Scott Chacon • Git — ветки, деревья, лес от Сергея Сергеева
None
commit
None
None
None
None
None
В коммите появился parent parent — связи графа Что такое
HEAD?
None
branches
›❯ git checkout dev ›❯ git checkout master
›❯ git commit
›❯ git checkout HEAD^^ ›❯ git checkout master~ ›❯ git
checkout HEAD@{2}
HEAD^ master~3 f6ad45^^~2 HEAD@{4} @{yesterday}
reflog
None
merge rebase
›❯ git merge master ›❯ git checkout master ›❯ git
merge feature
None
›❯ git rebase master ›❯ git checkout master ›❯ git
merge dev
None
›❯ git rebase --onto master base ›❯ git checkout master
›❯ git merge feature
›❯ git rebase --onto master base ›❯ git checkout master
›❯ git merge feature
›❯ git rebase --onto master base ›❯ git checkout master
›❯ git merge feature
cherry-pick
›❯ git checkout master ›❯ git cherry-pick dev^ ›❯ git
cherry-pick dev ›❯ git reset --hard HEAD dev
›❯ git checkout master ›❯ git cherry-pick dev^ ›❯ git
cherry-pick dev ›❯ git reset --hard HEAD dev
›❯ git checkout master ›❯ git cherry-pick dev^ ›❯ git
cherry-pick dev ›❯ git reset --hard HEAD dev
stash
›❯ git stash ›❯ git stash pop
›❯ git stash ›❯ git stash pop
bisect
Вот и всё! Спасибо! twitter.com/vtambourine
More Decks by Benjamin Tambourine
See All by Benjamin Tambourine
Gylfie the Robot
vtambourine
1
66
Other Decks in Technology
See All in Technology
Terraform 0 to 100:100個以上のリポジトリを常に最新にし続けるための自動化
sue445
3
1.4k
Kiro のリモートワークスペース: IDE は手元のままで、ワークスペースをクラウド、コンテナ、自前のマシンに置く
inariku
PRO
1
150
メール到達性を支える、リンク先URLのドメイン評価の扱い方
wind111
0
200
攻撃と守りは何が変わり、何が変わらないのか~最近の不正アクセスから考える、リスク評価と標準の使いどころ
oidfj
2
320
RAGの改善を速く回すための評価基盤
yosukeyoshida
6
3.6k
ノードが消える前提で設計する!Karpenterで金融システムを止めないためのノウハウ大全
daitak
1
250
コピーオンライト型ファイルシステムと ランダム書き込み
sat
PRO
2
140
ブース設計、 お前もプロダクトだったのか / So Booth Design Was a Product All Along
akihiro0038
0
150
Amazon EFS のマルウェアスキャンをClamAV で自前実装したら苦労した話
mtmtfactory01
0
110
AWS Client VPNの設定でハマったポイントとその過程での気づき
amarelo_n24
1
440
落とし穴にハマってわかった 開発生産性を測るときに気をつけたいこと
munakata
3
490
現地速報! Microsoft Ignite アップデートレポート
kasada
1
460
Featured
See All Featured
What does AI have to do with Human Rights?
axbom
PRO
1
2.5k
How Fast Is Fast Enough? [PerfNow 2025]
tammyeverts
3
990
The innovator’s Mindset - Leading Through an Era of Exponential Change - McGill University 2025
jdejongh
PRO
1
400
Leo the Paperboy
mayatellez
11
2.5k
<Decoding/> the Language of Devs - We Love SEO 2024
nikkihalliwell
1
380
Optimizing for Happiness
mojombo
378
72k
The Impact of AI in SEO - AI Overviews June 2024 Edition
aleyda
6
1.3k
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
3k
sira's awesome portfolio website redesign presentation
elsirapls
0
520
Visualization
eitanlees
153
17k
The Cult of Friendly URLs
andyhume
79
7.1k
ラッコキーワード サービス紹介資料
rakko
5
6M