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

Leaning Git

Avatar for Ran Tavory Ran Tavory
May 25, 2014
Programming
1
180

Leaning Git

Introduction to the team at Totango - a team of SVN users to git.

Avatar for Ran Tavory

Ran Tavory

May 25, 2014
Tweet

More Decks by Ran Tavory

See All by Ran Tavory
go-grpc-channelz: a Go based UI for gRPC's channelz
Avatar for Ran Tavory rantav
0
570
Code Review (Navy Hackathon)
Avatar for Ran Tavory rantav
0
72
Infrastructure Testing Using Kubernetes And Golang
Avatar for Ran Tavory rantav
0
79
Infrastructure testing using Kubernetes
Avatar for Ran Tavory rantav
0
530
Interview Workshop - Technical Questions
Avatar for Ran Tavory rantav
0
330
Code Review Best Practices
Avatar for Ran Tavory rantav
0
83
Code Review @ AppsFlyer
Avatar for Ran Tavory rantav
0
83
GraphQL at Yodas
Avatar for Ran Tavory rantav
2
170
Git for champs
Avatar for Ran Tavory rantav
0
140

Other Decks in Programming

See All in Programming
PicoRuby on Rails
Avatar for makicamel makicamel
2
140
코딩 에이전트 체크리스트: Claude Code ver.
Avatar for nacyot nacyot
0
840
RailsGirls IZUMO スポンサーLT
Avatar for 16bit_idol 16bitidol
0
190
iOS 26にアップデートすると実機でのHot Reloadができない？
Avatar for Aoi Umigishi umigishiaoi
0
130
PHPで始める振る舞い駆動開発(Behaviour-Driven Development)
Avatar for uutan1108 ohmori_yusuke
2
410
設計やレビューに悩んでいるPHPerに贈る、クリーンなオブジェクト設計の指針たち
Avatar for panda_program panda_program
6
2.3k
初学者でも今すぐできる、Claude Codeの生産性を10倍上げるTips
Avatar for Oikon s4yuba
16
12k
明示と暗黙 ー PHPとGoの インターフェイスの違いを知る
Avatar for shimabox shimabox
2
580
おやつのお供はお決まりですか？@WWDC25 Recap -Japan-\(region).swift
Avatar for gangan shingangan
0
140
AIプログラマーDevinは PHPerの夢を見るか？
Avatar for Shinya Saita shinyasaita
1
230
#kanrk08 / 公開版 PicoRubyとマイコンでの自作トレーニング計測装置を用いたワークアウトの理想と現実
Avatar for bash0C7 bash0c7
1
880
スタートアップの急成長を支えるプラットフォームエンジニアリングと組織戦略
Avatar for Yusuke Suto sutochin26
1
6.5k

Featured

See All Featured
Making Projects Easy
Avatar for Brett Harned brettharned
116
6.3k
Gamification - CAS2011
Avatar for David Bonilla davidbonilla
81
5.4k
Performance Is Good for Brains [We Love Speed 2024]
Avatar for Tammy Everts tammyeverts
10
970
Rebuilding a faster, lazier Slack
Avatar for samanthasiow samanthasiow
83
9.1k
Large-scale JavaScript Application Architecture
Avatar for Addy Osmani addyosmani
512
110k
What’s in a name? Adding method to the madness
Avatar for Product Marketing Alliance productmarketing
PRO
23
3.5k
Mobile First: as difficult as doing things right
Avatar for Swwweet swwweet
223
9.7k
Learning to Love Humans: Emotional Interface Design
Avatar for Aarron Walter aarron
273
40k
Done Done
Avatar for chrislema chrislema
184
16k
[RailsConf 2023 Opening Keynote] The Magic of Rails
Avatar for Eileen M. Uchitelle eileencodes
29
9.6k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
Avatar for Dan Newman danielanewman
229
22k
How To Stay Up To Date on Web Technology
Avatar for Chris Coyier chriscoyier
790
250k

Transcript

  1. Git Introduction For Subversion Users Ran Tavory Totango Sunday, May

    25, 14

  2. Why Git? • Because IT IS BETTER Sunday, May 25,

    14

  3. Git is a File System Sunday, May 25, 14

  4. All (most) Operations are Local and Fast! • Commit •

    Log (view history) • Diff • ... Sunday, May 25, 14

  5. Git is Distributed Sunday, May 25, 14

  6. Git is Fast Sunday, May 25, 14

  7. Lightweight (and local) Branching Sunday, May 25, 14

  8. Data Integrity Sunday, May 25, 14

  9. Staging Area Sunday, May 25, 14

  10. Stash Area Sunday, May 25, 14

  11. Sunday, May 25, 14

  12. Git Setup $ brew install git $ git config --global

    user.name “Ran Tavory” $ git config --global user.email “[email protected]” https://gist.github.com/rantav/ 5d6fb14057f062ecbc70 Sunday, May 25, 14

  13. GitHub Setup https://help.github.com/articles/ set-up-git Sunday, May 25, 14

  14. Clone the Repo $git clone https://github.com/ totango/main.git Sunday, May 25,

    14

  15. git status Sunday, May 25, 14

  16. git add Sunday, May 25, 14

  17. git diff Sunday, May 25, 14

  18. git commit Sunday, May 25, 14

  19. git commit --amend Sunday, May 25, 14

  20. git checkout Sunday, May 25, 14

  21. git rm Sunday, May 25, 14

  22. git mv Sunday, May 25, 14

  23. git log Sunday, May 25, 14

  24. git log -p Sunday, May 25, 14

  25. git log --word-diff Sunday, May 25, 14

  26. git log --stat Sunday, May 25, 14

  27. git log hacking Sunday, May 25, 14

  28. git remote Sunday, May 25, 14

  29. git pull Sunday, May 25, 14

  30. rebase or no? • Prefer rebase • this keeps the

    commit log cleaner •git pl • Sometimes an actual merge is needed • So don’t rebase • For example, when merging branches Sunday, May 25, 14

  31. git push Sunday, May 25, 14

  32. Git for SVN Sunday, May 25, 14

  33. Git for SVN Sunday, May 25, 14

  34. Git for SVN Sunday, May 25, 14

  35. Git Lifecycle Sunday, May 25, 14

  36. The Staging Area (AKA The Index) Sunday, May 25, 14

  37. .gitignore Sunday, May 25, 14

  38. Learning More Sunday, May 25, 14

  39. Bonus: zsh integration Sunday, May 25, 14

  40. Not Today: Branching Sunday, May 25, 14

  41. Totango Links • Wiki: https://sites.google.com/a/ totango.com/wiki/engineering/git • Repo: https://github.com/totango/main •

    CI: TODO Sunday, May 25, 14

  42. References http://git-scm.com/about http://thkoch2001.github.io/whygitisbetter/ http://www.slideshare.net/manishchaks/subversion- to-git-migration http://www.git-tower.com/blog/git-for-subversion- users-cheat-sheet-detail/ http://git.or.cz/course/svn.html AKA where

    did I steal from? Sunday, May 25, 14