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
Claude Code公式skillで 自分の仕事を少しずつ手放そう！（Claude Code開発ノウハウ大公開スペシャル by クラスメソッド）
Avatar for Kei Masaoka kaym
1
480
SRE本の知られざる名シーン / The Hidden Gems of Google SRE Book
Avatar for Narimichi Takamura nari_ex
1
420
カードゲーム作りが教えてくれた プロダクトオーナーシップ
Avatar for Sammy(MoritaMasami) moritamasami
0
110
発表と総括 / Presentations and Summary
Avatar for Kenji Saito ks91
PRO
0
140
ソニー銀行におけるビジネスアジリティ向上のためのクラウドシフト戦略
Avatar for srenext srenext
0
680
美しいコードを書くためにF#を学んでみた話
Avatar for yud0uhu yud0uhu
1
450
【Claude Code】鹿野さんに聞く 私の推しの並行開発環境 大公開 / claude-code-parallel-2026-07-15
Avatar for tonkotsuboy_com tonkotsuboy_com
12
8.5k
AI時代の闇と光
Avatar for tatsuya1970 tatsuya1970
0
100
Data + AI Summit 2026 イベントレポート： 「AIがビジネスで意思決定するデータ基盤」へ
Avatar for KJ(Kenji Matsuda) nek0128
0
250
凡エンジニアがこの先生きのこるためには。〜TypeScript完全に理解したい〜
Avatar for Ryotaro Harada alchemy1115
2
310
DMM.com 購入改善推進チーム におけるCodeRabbitを用いた レビューフロー改善の一例
Avatar for Kanon ysknsid25
2
660
アップデートで何が変わった？デモで学んで使いこなすIBM Bob2.0
Avatar for mu (Mizuho Uehara) muehara
0
100

Featured

See All Featured
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
Avatar for Sophie Logan marketingsoph
0
270
Beyond borders and beyond the search box: How to win the global "messy middle" with AI-driven SEO
Avatar for David Carrasco davidcarrasco
3
180
Evolving SEO for Evolving Search Engines
Avatar for Ryan Jones ryanjones
0
240
Taking LLMs out of the black box: A practical guide to human-in-the-loop distillation
Avatar for Ines Montani inesmontani
PRO
3
2.3k
Navigating the moral maze — ethical principles for Al-driven product design
Avatar for Skipper Chong Warson skipperchong
2
420
Embracing the Ebb and Flow
Avatar for Simon Collison colly
88
5.1k
Responsive Adventures: Dirty Tricks From The Dark Corners of Front-End
Avatar for Vitaly Friedman smashingmag
254
22k
Git: the NoSQL Database
Avatar for Brandon Keepers bkeepers
PRO
432
67k
Building an army of robots
Avatar for Kyle Neath kneath
306
46k
From Legacy to Launchpad: Building Startup-Ready Communities
Avatar for Dug Song dugsong
0
260
WENDY [Excerpt]
Avatar for Tessa Abrams tessaabrams
11
38k
How to build an LLM SEO readiness audit: a practical framework
Avatar for Nick Samuel nmsamuel
1
800

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!