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
Benjamin Tambourine
November 16, 2015
Technology
0
54
Про git
Benjamin Tambourine
November 16, 2015
Tweet
Share
More Decks by Benjamin Tambourine
See All by Benjamin Tambourine
Gylfie the Robot
vtambourine
1
54
Other Decks in Technology
See All in Technology
.NET開発者のためのAzureの概要
tomokusaba
0
230
イオン店舗一覧ページのパフォーマンスチューニング事例 / Performance tuning example for AEON store list page
aeonpeople
2
280
知られざるprops命名の慣習 アクション編
uhyo
10
2.5k
Backboneとしてのtimm2025
yu4u
4
1.5k
ドキュメントはAIの味方!スタートアップのアジャイルを加速するADR
kawauso
3
360
AIエージェント就活入門 - MCPが履歴書になる未来
eltociear
0
490
トヨタ生産方式(TPS)入門
recruitengineers
PRO
2
220
帳票Vibe Coding
terurou
0
140
どこで動かすか、誰が動かすか 〜 kintoneのインフラ基盤刷新と運用体制のシフト 〜
ueokande
0
180
モバイルアプリ研修
recruitengineers
PRO
2
250
Yahoo!広告ビジネス基盤におけるバックエンド開発
lycorptech_jp
PRO
1
270
Yahoo!ニュースにおけるソフトウェア開発
lycorptech_jp
PRO
0
350
Featured
See All Featured
Agile that works and the tools we love
rasmusluckow
329
21k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
126
53k
Navigating Team Friction
lara
189
15k
GraphQLとの向き合い方2022年版
quramy
49
14k
Unsuck your backbone
ammeep
671
58k
Optimizing for Happiness
mojombo
379
70k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
26
3k
Automating Front-end Workflow
addyosmani
1370
200k
For a Future-Friendly Web
brad_frost
179
9.9k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
4k
We Have a Design System, Now What?
morganepeng
53
7.7k
How to Think Like a Performance Engineer
csswizardry
25
1.8k
Transcript
Про 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