Advertisement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement
Git As A Subversion Replacement

Check these out next

390a gitintro 12au
390a gitintro 12au
Nguyen Van Hung
Git One Day Training Notes
Git One Day Training Notes
glen_a_smith
Git and GitHub
Git and GitHub
Md. Ahsan Habib Nayan
Becoming a Git Master
Becoming a Git Master
Nicola Paolucci
Git and GitHub
Git and GitHub
James Gray
Docker perl build
Docker perl build
Workhorse Computing
Check the version with fixes. Link in description
Check the version with fixes. Link in description
Przemyslaw Koltermann
Continuous Infrastructure: Modern Puppet for the Jenkins Project - PuppetConf...
Continuous Infrastructure: Modern Puppet for the Jenkins Project - PuppetConf...
Puppet
1 of 46

Git As A Subversion Replacement

Jun. 11, 2008••
Download to read offline
Business
Technology

Gives an intro to git, from the perspective of subversion. Then goes on to show other git goodness.

Josh Nichols
Hacker
Advertisement
Advertisement
Advertisement

Recommended

Git vs svnGit vs svn
Git vs svnSuman Mukherjee8.8K views•24 slides
Git Tech TalkGit Tech Talk
Git Tech TalkChris Johnson33.7K views•42 slides
01 - Git vs SVN01 - Git vs SVN
01 - Git vs SVNEdward Goikhman1.6K views•35 slides
Basic GitBasic Git
Basic GitKnut Haugen309 views•58 slides
Streamline your development environment with dockerStreamline your development environment with docker
Streamline your development environment with dockerGiacomo Bagnoli1.8K views•48 slides
Git: An introduction of plumbing and porcelain commandsGit: An introduction of plumbing and porcelain commands
Git: An introduction of plumbing and porcelain commandsth5075.7K views•121 slides

More Related Content

Slideshows for you(20)

390a gitintro 12au390a gitintro 12au
390a gitintro 12au
Nguyen Van Hung•101 views
Git One Day Training NotesGit One Day Training Notes
Git One Day Training Notes
glen_a_smith•3.4K views
Git and GitHubGit and GitHub
Git and GitHub
Md. Ahsan Habib Nayan•1K views
Becoming a Git MasterBecoming a Git Master
Becoming a Git Master
Nicola Paolucci•933 views
Git and GitHubGit and GitHub
Git and GitHub
James Gray•11.2K views
Docker perl buildDocker perl build
Docker perl build
Workhorse Computing•3.3K views
Check the version with fixes. Link in descriptionCheck the version with fixes. Link in description
Check the version with fixes. Link in description
Przemyslaw Koltermann•119 views
Continuous Infrastructure: Modern Puppet for the Jenkins Project - PuppetConf...Continuous Infrastructure: Modern Puppet for the Jenkins Project - PuppetConf...
Continuous Infrastructure: Modern Puppet for the Jenkins Project - PuppetConf...
Puppet•5K views
GIT, RVM, FIRST HEROKU APPGIT, RVM, FIRST HEROKU APP
GIT, RVM, FIRST HEROKU APP
Pavel Tyk•1.3K views
Distributed Developer Workflows using GitDistributed Developer Workflows using Git
Distributed Developer Workflows using Git
Susan Potter•2K views
Understanding about gitUnderstanding about git
Understanding about git
Sothearin Ren•205 views
Git::HooksGit::Hooks
Git::Hooks
Mikko Koivunalho•869 views
Introduction to Git and GitHubIntroduction to Git and GitHub
Introduction to Git and GitHub
Bioinformatics and Computational Biosciences Branch•41.3K views
Git trainingGit training
Git training
adm_exoplatform•4.1K views
GIT | Distributed Version Control SystemGIT | Distributed Version Control System
GIT | Distributed Version Control System
Mohammad Imam Hossain•255 views
Inside Sqale's Backend at Sapporo Ruby Kaigi 2012Inside Sqale's Backend at Sapporo Ruby Kaigi 2012
Inside Sqale's Backend at Sapporo Ruby Kaigi 2012
Gosuke Miyashita•18.5K views
Puppet at GitHub - PuppetConf 2013Puppet at GitHub - PuppetConf 2013
Puppet at GitHub - PuppetConf 2013
Puppet•4.4K views
Git internalsGit internals
Git internals
Haggai Philip Zagury•2.9K views
Asynchronous Systems with Fn FlowAsynchronous Systems with Fn Flow
Asynchronous Systems with Fn Flow
José Paumard•608 views
Docker in practiceDocker in practice
Docker in practice
Jonathan Giannuzzi•4.5K views

Viewers also liked(20)

Festejo y DespedidaFestejo y Despedida
Festejo y Despedida
Red RADAR•655 views
Next Library Unconference 05 07 09Next Library Unconference 05 07 09
Next Library Unconference 05 07 09
pasdbp•480 views
Manual de excelManual de excel
Manual de excel
Lesli Cagua•563 views
Artez202Artez202
Artez202
Artez Artes Escénicas•3K views
Introduction to MindTech - NIHR Health Technology Co-operative in mental health Introduction to MindTech - NIHR Health Technology Co-operative in mental health
Introduction to MindTech - NIHR Health Technology Co-operative in mental health
NIHR_MindTech•1K views
Creative commonsCreative commons
Creative commons
Mindaugas Kiskis•713 views
Field servicesField services
Field services
RachelLewington•552 views
Futbol temporada 1992 1993Futbol temporada 1992 1993
Futbol temporada 1992 1993
miguelmedina1965•821 views
Anhad farm brochureAnhad farm brochure
Anhad farm brochure
Kalim Ahmed Lohar•297 views
Successful ChaRM ImplementationSuccessful ChaRM Implementation
Successful ChaRM Implementation
Alpha Sirius•2.2K views
Informe sobre trámites legales de súper tiendas olímpicaInforme sobre trámites legales de súper tiendas olímpica
Informe sobre trámites legales de súper tiendas olímpica
Christian Lopez•544 views
Testes gerais extensivo e intensivoTestes gerais extensivo e intensivo
Testes gerais extensivo e intensivo
Mário Campos•880 views
Integria IMS PresentationIntegria IMS Presentation
Integria IMS Presentation
Pandora FMS•1K views
Cien Águilas 2008Cien Águilas 2008
Cien Águilas 2008
Escuela Militar del Libertador Bernardo O'Higgins•11.7K views
SVN 2 GitSVN 2 Git
SVN 2 Git
Marco De Stefano•11K views
regiolog.com - Regionales Wissensmanagementregiolog.com - Regionales Wissensmanagement
regiolog.com - Regionales Wissensmanagement
Simon Dueckert•601 views
TEORIA DE ESTRUCTURAS-METODO DE CROSS-PROBLEMAS PROPUESTOSTEORIA DE ESTRUCTURAS-METODO DE CROSS-PROBLEMAS PROPUESTOS
TEORIA DE ESTRUCTURAS-METODO DE CROSS-PROBLEMAS PROPUESTOS
Ofinalca/Santa Teresa del Tuy•4.7K views
Seminar PaperSeminar Paper
Seminar Paper
Menna Ayman•230 views
Git vs SVNGit vs SVN
Git vs SVN
neuros•23.8K views
Lista de verificação super completa (check list)Lista de verificação super completa (check list)
Lista de verificação super completa (check list)
Robson Peixoto•93.1K views
Advertisement

Similar to Git As A Subversion Replacement(20)

Deployment With Subversion - Lorna MitchellDeployment With Subversion - Lorna Mitchell
Deployment With Subversion - Lorna Mitchell
dpc•2.7K views
GitGit
Git
joren de groof•644 views
Git Going With DVCS v1.5.2Git Going With DVCS v1.5.2
Git Going With DVCS v1.5.2
Matthew McCullough•823 views
PHP Deployment With SVNPHP Deployment With SVN
PHP Deployment With SVN
Lorna Mitchell•8.9K views
Git Going with DVCS v1.6.0Git Going with DVCS v1.6.0
Git Going with DVCS v1.6.0
Matthew McCullough•1.3K views
Git Started With GitGit Started With Git
Git Started With Git
Nick Quaranto•8.1K views
Travis CITravis CI
Travis CI
bsiggelkow•5.7K views
Git Going With DVCS v1.5.1Git Going With DVCS v1.5.1
Git Going With DVCS v1.5.1
Matthew McCullough•549 views
Version Control with SVNVersion Control with SVN
Version Control with SVN
PHPBelgium•26.7K views
Git+jenkins+rex presentationGit+jenkins+rex presentation
Git+jenkins+rex presentation
Dwi Sasongko Supriyadi•747 views
Git introductionGit introduction
Git introduction
Kornel Lugosi•585 views
GitGit
Git
Kerry Buckley•643 views
Built in ci-cd with kubernetes, jenkins and helmBuilt in ci-cd with kubernetes, jenkins and helm
Built in ci-cd with kubernetes, jenkins and helm
Pau López•1.1K views
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCS
Matthew McCullough•4.9K views
Git - Intro to the Basics of DVCSGit - Intro to the Basics of DVCS
Git - Intro to the Basics of DVCS
Matthew McCullough•577 views
JUC Europe 2015: A Reproducible Build Environment with JenkinsJUC Europe 2015: A Reproducible Build Environment with Jenkins
JUC Europe 2015: A Reproducible Build Environment with Jenkins
CloudBees•139 views
GitGit
Git
ArrrrCamp•707 views
GitGit
Git
Jeroen Jacobs•492 views
Building a Solr Continuous Delivery Pipeline with Jenkins: Presented by James...Building a Solr Continuous Delivery Pipeline with Jenkins: Presented by James...
Building a Solr Continuous Delivery Pipeline with Jenkins: Presented by James...
Lucidworks•1.3K views
Introduction To GitIntroduction To Git
Introduction To Git
Arnaud Seilles•3.3K views

Recently uploaded(20)

Carol Scott - Fast Track Your AI Journey.pdfCarol Scott - Fast Track Your AI Journey.pdf
Carol Scott - Fast Track Your AI Journey.pdf
SOLTUIONSpeople, THINKubators, THINKathons•276 views
Jeunesse Global Opportunity In 145 CountriesJeunesse Global Opportunity In 145 Countries
Jeunesse Global Opportunity In 145 Countries
bruceseah•16 views
Advanced Scheduling for Large, Complex Industrial ProjectsAdvanced Scheduling for Large, Complex Industrial Projects
Advanced Scheduling for Large, Complex Industrial Projects
Jeremie Averous•16 views
Don't Follow Donations with Silence_ Create an Email Welcome Journey...Right ...Don't Follow Donations with Silence_ Create an Email Welcome Journey...Right ...
Don't Follow Donations with Silence_ Create an Email Welcome Journey...Right ...
Bloomerang•167 views
slides1.pdfslides1.pdf
slides1.pdf
MirandaTarter•43 views
IPR Voya Disability Report 2023IPR Voya Disability Report 2023
IPR Voya Disability Report 2023
Olivia Kresic•328 views
YING AND YANG OF ORGANIZATION.pptxYING AND YANG OF ORGANIZATION.pptx
YING AND YANG OF ORGANIZATION.pptx
SaruGupta5•24 views
Why Kazakhstan - Real Estate.pdfWhy Kazakhstan - Real Estate.pdf
Why Kazakhstan - Real Estate.pdf
Faruq Hunter•21 views
Ashen Bhatti - How I Build Companies with LLM.pdfAshen Bhatti - How I Build Companies with LLM.pdf
Ashen Bhatti - How I Build Companies with LLM.pdf
SOLTUIONSpeople, THINKubators, THINKathons•90 views
Spring “Data” Cleaning Time for your Organization.pdfSpring “Data” Cleaning Time for your Organization.pdf
Spring “Data” Cleaning Time for your Organization.pdf
Bloomerang•80 views
Advantages of Ceiling Storage RacksAdvantages of Ceiling Storage Racks
Advantages of Ceiling Storage Racks
RackyourGarage•19 views
WAM Deck Jun_2023.pdfWAM Deck Jun_2023.pdf
WAM Deck Jun_2023.pdf
Western Alaska Minerals Corp.•356 views
OECD ziņojuma “Latvijas mājokļu pieejamības fonda stiprināšana” galvenās atziņasOECD ziņojuma “Latvijas mājokļu pieejamības fonda stiprināšana” galvenās atziņas
OECD ziņojuma “Latvijas mājokļu pieejamības fonda stiprināšana” galvenās atziņas
Ekonomikas ministrija/ Dzīvo siltāk•43 views
TYPES OF LEVERAGE - FINANCIAL MANAGEMENTTYPES OF LEVERAGE - FINANCIAL MANAGEMENT
TYPES OF LEVERAGE - FINANCIAL MANAGEMENT
SnekaRS•17 views
IPIC_2023 - Scan4Transport - Jaco Voorspuij.pdfIPIC_2023 - Scan4Transport - Jaco Voorspuij.pdf
IPIC_2023 - Scan4Transport - Jaco Voorspuij.pdf
Jaco Voorspuij•22 views
Barbar Bahatti - Harnessing the Power of LLMs.pdfBarbar Bahatti - Harnessing the Power of LLMs.pdf
Barbar Bahatti - Harnessing the Power of LLMs.pdf
SOLTUIONSpeople, THINKubators, THINKathons•69 views
Best 5 Gold IRA Company Review.pdfBest 5 Gold IRA Company Review.pdf
Best 5 Gold IRA Company Review.pdf
Sourav Sikder•14 views
How To Get RichHow To Get Rich
How To Get Rich
umer586063•16 views
Why Kazakhstan - LogisticsWhy Kazakhstan - Logistics
Why Kazakhstan - Logistics
Faruq Hunter•18 views
Kanplexity Talk at Scrum Day LondonKanplexity Talk at Scrum Day London
Kanplexity Talk at Scrum Day London
Orderly Disruption•82 views
Advertisement

Git As A Subversion Replacement

  1. git as a subversion replacement it’s kinda like subversion, but more awesome! Josh Nichols technicalpickles.com
  2. Outline • Using how to use git in the same way you've gone accustomed to using subversion • Advantages of using git even just like subversion • Open source collaboration • Building rails apps on git Josh Nichols technicalpickles.com
  3. Some initial setup • Need to setup ~/.gitconfig • Set things like email address and name • Can setup command aliases for more svn like commands Josh Nichols technicalpickles.com
  4. ~/.gitconf [user] [color quot;branchquot;] email = quot;josh@technicalpickles.comquot; current = yellow reverse name = quot;Josh Nicholsquot; local = yellow [alias] remote = green st = status [color quot;diffquot;] co = checkout meta = yellow bold ci = commit frag = magenta bold [color] old = red bold branch = auto new = green bold diff = auto [color quot;statusquot;] status = auto added = yellow changed = green untracked = cyan Josh Nichols technicalpickles.com
  5. Let’s review some subversion workflows Josh Nichols technicalpickles.com
  6. Initial checkout svn repository checkout developer A developer B Josh Nichols technicalpickles.com
  7. Commit and update svn repository update commit developer A developer B Josh Nichols technicalpickles.com
  8. Branching svn repository cp sw developer A developer B Josh Nichols technicalpickles.com
  9. Alright, let’s see the commands Josh Nichols technicalpickles.com
  10. Initial checkout • subversion: • svn checkout http://somewhere.com/repo • git: • git clone http://somewhere.com/repo.git Josh Nichols technicalpickles.com
  11. Initial checkout svn repository git repository clone checkout developer A developer B developer A developer B Josh Nichols technicalpickles.com
  12. Differences between a checked-out repository • subversion: • keeps a copy of the last revision from repo • git: • keeps a copy of the entire repo Josh Nichols technicalpickles.com
  13. Differences between a remote repository • subversion: • can grab any particular path in the repository • git: • can only grab the entire repository • if you copy a checked out repository somewhere, you can actually use it as a remote repository Josh Nichols technicalpickles.com
  14. Adding a file • svn: • svn add path/to/file • git: • git add path/to/file Josh Nichols technicalpickles.com
  15. Differences for adding • svn • used for adding new files • git • used for adding new files AND recording modifications to existing files Josh Nichols technicalpickles.com
  16. Status • svn: • svn st • git: • git st Josh Nichols technicalpickles.com
  17. Differences for status • svn: • tracks: unversioned, new, deleted, modified • git: • tracks: unversioned, new, deleted, modified, modified but not ‘add’-ed Josh Nichols technicalpickles.com
  18. Committing • svn: • svn commit • git: • git commit • both: • can specify files to commit • can give commit message with -m Josh Nichols technicalpickles.com
  19. Commit svn repository git repository commit commit developer A developer B developer A developer B Josh Nichols technicalpickles.com
  20. Differences for committing • svn: • sends changes to remote repository • revision number is incrementing integer • git: • only commits to local repository • revision number is hash of the commit Josh Nichols technicalpickles.com
  21. Pushing to a remote repository • svn: • svn commit • git: • git push Josh Nichols technicalpickles.com
  22. Push svn repository git repository commit push developer A developer B developer A developer B Josh Nichols technicalpickles.com
  23. Diff • svn • svn diff • git • git diff Josh Nichols technicalpickles.com
  24. Differences for diff • svn • must be online • git • can be offline Josh Nichols technicalpickles.com
  25. Reverting • svn • svn revert some_file • git • git checkout some_file • yeah, it’s not so obvious Josh Nichols technicalpickles.com
  26. Differences for reverting • git • you don’t ‘revert’ as much as you ‘checkout’ a version of the last committed change Josh Nichols technicalpickles.com
  27. Updating • svn • svn update • git • svn pull Josh Nichols technicalpickles.com
  28. Update svn repository git repository update pull developer A developer B developer A developer B Josh Nichols technicalpickles.com
  29. Conflict resolution • Mostly the same • <<<<< • ===== • >>>>> Josh Nichols technicalpickles.com
  30. Branching • svn • svn cp . http://somewhere.com/repo/branch/blarg • svn sw --relocate http://somewhere.com/repo/ branch/blarg . • git • git branch blarg • git checkout blarg Josh Nichols technicalpickles.com
  31. Branching svn repository git repository checkout -b cp sw developer A developer B developer A developer B Josh Nichols technicalpickles.com
  32. Differences for branching • svn • makes changes immediately to remote repo • git • local repository only • ‘git push origin blarg’ to send to remote Josh Nichols technicalpickles.com
  33. Summary so far • There are a lot of similarities between svn/git • Main differences so far: • online v. offline • commits v. push • changesets • Questions? Josh Nichols technicalpickles.com
  34. Git hosting solution • Self-hosted • by hand • gitosis • Hosted • gitorious • repo.or.cz • GitHub Josh Nichols technicalpickles.com
  35. Ok, so what’s better about git? Josh Nichols technicalpickles.com
  36. My stash • svn • svn diff > changes.diff • svn revert -R . • git • git stash save Josh Nichols technicalpickles.com
  37. Offline committing • Extremely, extremely useful • Something appealing about committing from the beach without internet access Josh Nichols technicalpickles.com
  38. Branching • It actually works really well • Can merge between branches as much as you want • Don’t need to worry about specific revisions • Encourages more branching • fix branches, feature branches Josh Nichols technicalpickles.com
  39. Using a fix branch • git checkout -b amazing_fixes • make changes • git commit -m “I fixed the hell out of this bug” • git checkout master • git merge amazing_fixes • git push Josh Nichols technicalpickles.com
  40. Distributed • Can work with multiple remote repositories • push or pull Josh Nichols technicalpickles.com
  41. One repository to rule them all Push Push Core contributor Core contributor Email patch Pull Pull Random contributor Random contributor Pull Random contributor Josh Nichols technicalpickles.com
  42. Subversiveness • Play with subversion and cvs repositories using git! • git svn clone http://somewhere.com/repo • git svn dcommit • replays all your git commits as svn commits • git svn rebase • replays remote commits as git commits locally Josh Nichols technicalpickles.com
  43. Open source collaboration • With subversion, only ‘authorized’ users can ‘commit’ • As a non-committer, can’t make incremental changes towards a big refactorings • Typically would send patches around... problematic to make sure they are up to date Josh Nichols technicalpickles.com
  44. Open source collaboration • git and github solve all these concerns • behold, live demo! Josh Nichols technicalpickles.com
  45. Rails development • Rails 2.1 it supports out of the box (script/install) • Piston 1.9.x supports it • LIVE DEMO!!!!1one Josh Nichols technicalpickles.com
  46. Fin. Josh Nichols technicalpickles.com
Advertisement