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

Git, Graphically

Avatar for Aidan Feldman Aidan Feldman
May 19, 2015
Technology
350
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
48
Love and agony: containers in government
Avatar for Aidan Feldman aidanfeldman
0
320
Compliance Masonry QuickStart
Avatar for Aidan Feldman aidanfeldman
0
590
Search for Static Sites
Avatar for Aidan Feldman aidanfeldman
2
670
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
55

Other Decks in Technology

See All in Technology
SoccerMaster: A Vision Foundation Model for Soccer Understanding
Avatar for Kazuyuki Miyazawa kzykmyzw
0
110
キャリアの中で本を作る / Making a Book During Your Career
Avatar for akihisa1210 ak1210
0
140
人を動かすのは時間ではなく、納得感 〜新任EMが入社3ヶ月、組織を2回変えた話〜
Avatar for KAKEHASHI kakehashi
PRO
3
260
Type-safe IaC for Dart
Avatar for Nozomi Koborinai coborinai
0
110
AI Coding Agent時代のcdk-nagガードレール 〜組織ルールを強制CIで守り抜く設計の挑戦〜
Avatar for みずほリサーチ&テクノロジーズ株式会社 先端技術研究部 mhrtech
3
290
Control Planeで育てるBtoB SaaSの認証基盤 - SRE NEXT 2026
Avatar for pokohide pokohide
1
2.5k
ファミコンでPHPを動かす / PHP on the Famicom
Avatar for HASEGAWA Tomoki tomzoh
2
180
AI時代のYAGNI：「爆速で無駄になった機能」からの学び / 20260720 Naoki Takahashi
Avatar for SHIFT EVOLVE shift_evolve
PRO
2
160
2年前に削除したPHPクラスが、 ある日突然決済をエラーにした
Avatar for ykagano ykagano
1
140
Gen3R: 3D Scene Generation Meets Feed-Forward Reconstruction
Avatar for Spatial AI Network spatial_ai_network
0
130
企業でAWS Organizationsを動かすための組織設計の考え方
Avatar for NRI Netcom nrinetcom
PRO
1
100
「最後に責任を取るのはチーム」— 人間のPRレビューを最小化してアップデートしたメンタルモデル
Avatar for Jotaro Nishime jnishime_dresscode
0
760

Featured

See All Featured
Dealing with People You Can't Stand - Big Design 2015
Avatar for Cassini Nazir cassininazir
367
27k
Speed Design
Avatar for Sergey Chernyshev sergeychernyshev
33
1.9k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
31
10k
Measuring Dark Social's Impact On Conversion and Attribution
Avatar for Stephen Akadiri stephenakadiri
2
240
Visualizing Your Data: Incorporating Mongo into Loggly Infrastructure
Avatar for mongodb mongodb
49
10k
Google's AI Overviews - The New Search
Avatar for Barry Adams badams
0
1.1k
GraphQLの誤解/rethinking-graphql
Avatar for sonatard sonatard
75
12k
HTML-Aware ERB: The Path to Reactive Rendering @ RubyCon 2026, Rimini, Italy
Avatar for Marco Roth marcoroth
2
330
Code Reviewing Like a Champion
Avatar for maltzj maltzj
528
40k
DBのスキルで生き残る技術 - AI時代におけるテーブル設計の勘所
Avatar for soudai sone soudai
PRO
67
56k
Keith and Marios Guide to Fast Websites
Avatar for Keith Pitt keithpitt
413
23k
The Mindset for Success: Future Career Progression
Avatar for Greg Gifford greggifford
PRO
0
410

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!