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

Git, Graphically

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

Git, Graphically

Visual representations of git operations.

Avatar for Aidan Feldman

Aidan Feldman

May 19, 2015
Tweet

More Decks by Aidan Feldman

See All by Aidan Feldman
Human-Centered DevOps
Avatar for Aidan Feldman aidanfeldman
0
16
Love and agony: containers in government
Avatar for Aidan Feldman aidanfeldman
0
260
Compliance Masonry QuickStart
Avatar for Aidan Feldman aidanfeldman
0
540
Search for Static Sites
Avatar for Aidan Feldman aidanfeldman
2
660
Everything I think I understand about IT compliance
Avatar for Aidan Feldman aidanfeldman
1
220
DevOps at Large: Modernizing apps and infrastructure in the federal government
Avatar for Aidan Feldman aidanfeldman
0
590
Dabbling in Docker
Avatar for Aidan Feldman aidanfeldman
0
150
Teaching Software to Tango
Avatar for Aidan Feldman aidanfeldman
0
39

Other Decks in Technology

See All in Technology
定期的な価値提供だけじゃない、スクラムが導くチームの共創化 / 20251004 Naoki Takahashi
Avatar for SHIFT EVOLVE shift_evolve
PRO
4
360
Access-what? why and how, A11Y for All - Nordic.js 2025
Avatar for Geisy Domiciano gdomiciano
1
120
OCI Network Firewall 概要
Avatar for oracle4engineer oracle4engineer
PRO
2
7.8k
Optuna DashboardにおけるPLaMo2連携機能の紹介 / PFN LLM セミナー
Avatar for Preferred Networks pfn
PRO
2
940
20201008_ファインディ_品質意識を育てる役目は人かAIか___2_.pdf
Avatar for ファインディ株式会社（イベント資料アップ用） findy_eventslides
2
590
防災デジタル分野での官民共創の取り組み (2)DIT/CCとD-CERTについて
Avatar for Masakatsu Sugii ditccsugii
0
120
英語は話せません！それでも海外チームと信頼関係を作るため、対話を重ねた2ヶ月間のまなび
Avatar for ニイオカ niioka_97
0
130
カンファレンスに託児サポートがあるということ / Having Childcare Support at Conferences
Avatar for nobu09 nobu09
1
500
自動テストのコストと向き合ってみた
Avatar for SmartHR 品質保証部 qa
0
210
ACA でMAGI システムを社内で展開しようとした話
Avatar for Yuji Masaoka | まっぴぃ mappie_kochi
1
310
能登半島地震で見えた災害対応の課題と組織変革の重要性
Avatar for Masakatsu Sugii ditccsugii
0
240
PLaMoの事後学習を支える技術 / PFN LLMセミナー
Avatar for Preferred Networks pfn
PRO
9
4k

Featured

See All Featured
Learning to Love Humans: Emotional Interface Design
Avatar for Aarron Walter aarron
274
41k
Build The Right Thing And Hit Your Dates
Avatar for Maggie C. maggiecrowley
37
2.9k
How to train your dragon (web standard)
Avatar for Monica Dinculescu notwaldorf
96
6.3k
For a Future-Friendly Web
Avatar for Brad Frost brad_frost
180
9.9k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
Avatar for Eileen M. Uchitelle eileencodes
140
34k
Optimising Largest Contentful Paint
Avatar for Harry Roberts csswizardry
37
3.4k
Connecting the Dots Between Site Speed, User Experience & Your Business [WebExpo 2025]
Avatar for Tammy Everts tammyeverts
9
590
Dealing with People You Can't Stand - Big Design 2015
Avatar for Cassini Nazir cassininazir
367
27k
Sharpening the Axe: The Primacy of Toolmaking
Avatar for Bryan Cantrill bcantrill
45
2.5k
Site-Speed That Sticks
Avatar for Harry Roberts csswizardry
11
890
The Language of Interfaces
Avatar for Des Traynor destraynor
162
25k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
Avatar for Rebecca Miller-Webster rmw
35
3.2k

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!