Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git, Graphically

Avatar for Aidan Feldman Aidan Feldman
May 19, 2015
Technology
360
0

Git, Graphically

Visual representations of git operations.

Avatar for Aidan Feldman

Aidan Feldman

May 19, 2015

More Decks by Aidan Feldman

See All by Aidan Feldman
Human-Centered DevOps
Avatar for Aidan Feldman aidanfeldman
0
51
Love and agony: containers in government
Avatar for Aidan Feldman aidanfeldman
0
320
Compliance Masonry QuickStart
Avatar for Aidan Feldman aidanfeldman
0
600
Search for Static Sites
Avatar for Aidan Feldman aidanfeldman
2
680
Everything I think I understand about IT compliance
Avatar for Aidan Feldman aidanfeldman
1
240
DevOps at Large: Modernizing apps and infrastructure in the federal government
Avatar for Aidan Feldman aidanfeldman
0
610
Dabbling in Docker
Avatar for Aidan Feldman aidanfeldman
0
190
Teaching Software to Tango
Avatar for Aidan Feldman aidanfeldman
0
58

Other Decks in Technology

See All in Technology
AIレビュー時代に必要なのは、SLOで引く撤退ライン
Avatar for nobuoooo nobuoooo
0
150
MCPを待つな、パスキーを拡げよう（OAuth/OIDC Numa (Immersion) Workshop 2026）
Avatar for OpenID Foundation Japan oidfj
PRO
0
350
現場の暗黙知を継承するAIエージェント — 対話から生まれる長期記憶と Skills
Avatar for Atsuki Shirasawa atsukish
0
130
[ホンマでっか SRE] あなたはなぜ SRE に?
Avatar for _awache _awache
0
360
Data Hubグループ 紹介資料
Avatar for Sansan, Inc. sansan33
PRO
0
3.2k
研究開発部の紹介 / Sansan R&D Profile
Avatar for Sansan, Inc. sansan33
PRO
4
24k
Digital Credentials API × OpenID4VP ブラウザ完結型本人確認の実装知見（OAuth/OIDC Numa (Immersion) Workshop 2026）
Avatar for OpenID Foundation Japan oidfj
PRO
0
340
サーバー常駐型の 簡易障害調査AI エージェントを作ってみた話
Avatar for masayoshi masayoshi
1
320
Introduction to Bill One Development Engineer
Avatar for Sansan, Inc. sansan33
PRO
0
480
どんな手を使っても絶対間に合わせるスケジューラ
Avatar for asari asari194617
0
1.5k
internal/testlog で遊ぼう
Avatar for rokuosan rokuosan
0
340
Digitization部 紹介資料
Avatar for Sansan, Inc. sansan33
PRO
2
7.8k

Featured

See All Featured
Visual Storytelling: How to be a Superhuman Communicator
Avatar for David Neal reverentgeek
2
630
GraphQLの誤解/rethinking-graphql
Avatar for sonatard sonatard
75
12k
ピンチをチャンスに：未来をつくるプロダクトロードマップ #pmconf2020
Avatar for Aki / @LoveIdahoBurger aki_iinuma
128
56k
The Art of Programming - Codeland 2020
Avatar for Erika Heidi erikaheidi
57
14k
Accessibility Awareness
Avatar for Sarah Abderemane sabderemane
1
180
The Straight Up "How To Draw Better" Workshop
Avatar for Dennis Kardys denniskardys
239
140k
Max Prin - Stacking Signals: How International SEO Comes Together (And Falls Apart)
Avatar for Tech SEO Connect techseoconnect
PRO
0
430
Test your architecture with Archunit
Avatar for Yoan thirion
2
2.4k
Redefining SEO in the New Era of Traffic Generation
Avatar for Szymon Słowik szymonslowik
1
400
Designing for Performance
Avatar for Lara Hogan lara
611
70k
GraphQLとの向き合い方2022年版
Avatar for Yosuke Kurami quramy
50
15k
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
Avatar for Sophie Logan marketingsoph
0
390

Transcript

  1. git, graphically Aidan Feldman

  2. time normal history

  3. branching master

  4. branching master feature

  5. branching master feature

  6. branching master feature

  7. branching master feature bugfix git checkout master git merge bugfix

  8. branching master feature bugfix git merge feature

  9. branching master feature bugfix

  10. amending master git commit —amend

  11. amending master

  12. rebasing master feature

  13. rebasing master feature git checkout feature git rebase master

  14. rebasing master feature

  15. squashing master feature

  16. squashing master feature git checkout feature git rebase -i master

  17. None
  18. None

  19. squashing master feature

  20. thanks!