SlideShare a Scribd company logo

Git talk from Open 2011 conference in Israel

Reuven Lerner, profile picture
Reuven Lerner

The document discusses version control systems and Git. It describes some key benefits of Git such as distributed version control which allows everyone to have the full codebase and commit history, easy branching and merging, and the ability to work offline. The document provides examples of basic Git commands like initializing a repository, adding files, and committing changes. It also highlights features like local repositories for fast operations, tagging releases, and tools for debugging like git blame.

Technology
Related topics:
Version Control Insights
1 of 52
Downloaded 14 times
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
Git Reuven M. Lerner • reuven@lerner.co.il Open Israel Conference June 30th, 2011
Who am I? • Web developer, software architect, consultant, lecturer/trainer • Linux Journal columnist since 1996 • Mostly Ruby on Rails + PostgreSQL, but also Python, PHP, jQuery, and lots more... • Git user (and enthusiast) since 2008
What is version control?
Time machine • Return to any point in a project’s history • Find out how files, folders have changed • Learn which user made which changes
Backup • Never fear that you’ve deleted a file — just rewind the history • Everything is recorded, can be undone
Maintenance tool • “Tag” releases • Who is to blame for a particular bug? • When did we introduce a particular problem? • Deploy specific versions on specific servers
Scratchpad • Try out new ideas • Experiment with alternative techniques • Upgrade a library • Refactor without affecting the “live” code base
Collaboration tool • Work without fear of “stomping” on someone else’s code • Identify conflicts between what developers wrote • Mix and match teams for projects
Version control is great • If you’re a programmer and not using version control, you’re really missing out • It’s also good for non-programs, such as configuration files • If you’re a CTO/team leader/VP R&D and your people aren’t using version control, you’re inviting disaster
What do people use? • RCS (ancient history) • CVS (should be ancient history) • Subversion (“a better CVS”) • SourceSafe • Perforce • lots of other systems
Problems with these • Work requires a server connection • (You can work, but not commit.) • Branching and merging is painful and slow • So no one does it! • Enforces a particular workflow • More code, more developers — slower VC
Distributed version control • Distributed: Everyone is their own server! • Everyone has a complete commit history • No single point of failure • Commit whenever you want (i.e., often) • Merge when two repositories connect
Git • Linus needed a VCS... so he wrote one! • Fast • Accurate • Distributed • Massively scalable • Super flexible
Open-source Git users • Linux kernel • PostgreSQL • Ruby language • Ruby on Rails • Perl language • among many, many others
Give me details! • What does Git do that others don’t? • Why do I claim that Git has changed my life?
Branching & merging • Branching and merging is both easy and fast in Git • I often branch and merge several times in a given day • When I used SVN, I would do everything in my power to avoid branching, because merges were long and difficult
Branching & merging • Create a branch: git checkout -b new-branch • Merge commits from other-branch git merge other-branch • Yes, it’s really that easy. • You don’t even have to change directories!
Easy branching changes everything! • Every new feature goes in a branch • Merging becomes easy, fast, and natural • Side projects are stored, not kept out of version control for fear of “contamination” • Commit, commit, commit all of the time, in an appropriate branch — never lose work!
Local repository is great • Work without a network connection • Commits, merges, and switching branches are nearly instantaneous • Reports and logs are super-fast • “Show me all files modified on Tuesday of last week” produces immediate resultss
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
The result master ✔ /tmp/myapp $ git log commit 030c6b691993e0f43d78119d9ff1c9e759120d11 Author: Reuven Lerner <reuven@lerner.co.il> Date: Thu Jun 30 12:29:29 2011 +0300 I
Committing in stages • You can commit all modified files (“git commit -a”) • You can add files to be committed (“git add foo.rb”) over time • Using the staging area gives you tremendous flexibility before committing
Remote branches • A local branch can “track” a remote branch • Different branches can be on different servers — and then you can merge across them • One possible workflow: Read from one remote branch, and write to another
Integration • Git is all small Unix commands • Easily integrated into text editors, IDEs, cron jobs, monitoring, and system tasks • Example: Continuous integration servers • Example: Code-analysis tools • Also: Front ends to SVN and others!
git blame • Shows the commit, user, and timestamp of when each line of a file was changed • Useful when you want to know who broke the build • Also useful for deflecting blame from clients, who think you broke something!
a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
Commit a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
Commit User a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
Commit User Timestamp a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
Commit User Timestamp Line # and code a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
git bisect • You introduced a bug, but don’t know where? Git can find it! • Give two endpoints • Git does a binary search between them • For each commit, tell Git whether it is “good” or “bad” • This finds the bug very quickly
Stash • Temporary storage space • Useful if you have done enough work to keep, but not enough for a commit • Emergency fixes in the middle of working on something else • If you need, put the stash into a new branch • Oh, you can have multiple stashes
Hooks • Execute arbitrary code when things happen • Example: Update submodules automatically • Example: Send e-mail after a commit • Example: Heroku uses hooks to deploy a new version of your Web app when you push to them!
Workflows • Git supports many, many workflows • Traditional centralized server • BDFL and users • BDFL and Lieutenants • Do what works for you!
Traditional Source: ProGit.org
Integration-manager Source: ProGit.org
Large, BDFL Source: ProGit.org
Cherry picking • You can merge specific commits, or parts of commits • Amazingly powerful
Rebase • An alternative to regular merging • First merge all external commits, then replay your changes on top • Helps to keep you aligned with remote branches • Avoids some merge-conflict issues
Submodules • A Git repository can point to other repositories — submodules • Break a project into smaller projects • Git puts the pieces together for you!
Amending commits • Commits are not sacred in Git • Rather, they are a tool to manage history • Change, amend, and edit commits • Yes, this can be dangerous! • Also avoids hundreds of “fixed typo” commits in a row...
Commercial hosting • You can host Git repositories on your own • Want to go commercial? GitHub, Gitorious, and many others work great • GitHub is free for open-source projects, and thus very popular
Git talk from Open 2011 conference in Israel
GUIs • Yes, there are now GUIs for Git • Windows, Mac, and Unix versions all exist • Integration with Emacs and other editors for hard-core hacker-nerds • Also: Shell-prompt integration for Unix
In short • Git has completely changed how I develop code, both alone and with others • The speed and easy branching/merging are game-changers • It’s really not that hard to start using... • ... and once you start, you’ll never want to go back to CVS or SVN
Want to learn more? • Mailing lists, wikis, and blogs • http://git-scm.com/ • http://progit.org/ • http://gitimmersion.com/ • I’m probably going to offer Git training soon — let me know if you’re interested!
Thanks! (Any questions?) reuven@lerner.co.il http://www.lerner.co.il/ 054-496-8405 “reuvenlerner” on Skype/AIM

More Related Content

PPT
Git Introduction
Gareth Hall
 
PDF
Git training
Jérémy Gobet
 
PDF
Git - The Incomplete Introduction
rschwietzke
 
PDF
Git, from the beginning
James Aylett
 
PDF
Presentacion git
Ignacio Martín
 
PDF
Enjoy fighting regressions_with_git_bisect
Christian Couder
 
PDF
Git and Testing
Christian Couder
 
PDF
Git tutorial
Elli Kanal
 
Git Introduction
Gareth Hall
 
Git training
Jérémy Gobet
 
Git - The Incomplete Introduction
rschwietzke
 
Git, from the beginning
James Aylett
 
Presentacion git
Ignacio Martín
 
Enjoy fighting regressions_with_git_bisect
Christian Couder
 
Git and Testing
Christian Couder
 
Git tutorial
Elli Kanal
 

What's hot (18)

PDF
New Views on your History with git replace
Christian Couder
 
PDF
Inside GitHub with Chris Wanstrath
SV Ruby on Rails Meetup
 
PDF
Introduction to Git, DrupalCamp LA 2015
mwrather
 
PPTX
Hello, Git!
Shafiul Azam Chowdhury
 
PDF
Deep dark-side of git: How git works internally
SeongJae Park
 
PDF
slides.pdf
vidsvagi
 
PDF
git and github
Darren Oakley
 
PDF
Introduction to Git (part 1)
Salvatore Cordiano
 
PDF
Github - Git Training Slides: Foundations
Lee Hanxue
 
PDF
Introduction to Git
Colin Su
 
PDF
Starting with Git & GitHub
Nicolás Tourné
 
PPTX
Git 101 for Beginners
Anurag Upadhaya
 
PDF
Git: An introduction of plumbing and porcelain commands
th507
 
KEY
Git and GitHub
James Gray
 
PPTX
Git One Day Training Notes
glen_a_smith
 
PDF
Now i git it!!!
Yoram Michaeli
 
PDF
Git training v10
Skander Hamza
 
PDF
Code review and automated testing for Puppet code
wzzrd
 
New Views on your History with git replace
Christian Couder
 
Inside GitHub with Chris Wanstrath
SV Ruby on Rails Meetup
 
Introduction to Git, DrupalCamp LA 2015
mwrather
 
Hello, Git!
Shafiul Azam Chowdhury
 
Deep dark-side of git: How git works internally
SeongJae Park
 
slides.pdf
vidsvagi
 
git and github
Darren Oakley
 
Introduction to Git (part 1)
Salvatore Cordiano
 
Github - Git Training Slides: Foundations
Lee Hanxue
 
Introduction to Git
Colin Su
 
Starting with Git & GitHub
Nicolás Tourné
 
Git 101 for Beginners
Anurag Upadhaya
 
Git: An introduction of plumbing and porcelain commands
th507
 
Git and GitHub
James Gray
 
Git One Day Training Notes
glen_a_smith
 
Now i git it!!!
Yoram Michaeli
 
Git training v10
Skander Hamza
 
Code review and automated testing for Puppet code
wzzrd
 
Ad

Viewers also liked (12)

PDF
Big Data — Your new best friend
Reuven Lerner
 
KEY
PostgreSQL talk, Database 2011 conference
Reuven Lerner
 
PDF
What can Ruby learn from Python (and vice versa)?
Reuven Lerner
 
PDF
ActiveRecord 2.3
Reuven Lerner
 
PDF
Functional Python Webinar from October 22nd, 2014
Reuven Lerner
 
PDF
Web APIs: The future of software
Reuven Lerner
 
KEY
Rails console
Reuven Lerner
 
PDF
Dynamic languages, for software craftmanship group
Reuven Lerner
 
PDF
Python's magic methods
Reuven Lerner
 
KEY
PostgreSQL
Reuven Lerner
 
PDF
Technical training business talk.key
Reuven Lerner
 
PDF
Intro to cloud computing — MegaCOMM 2013, Jerusalem
Reuven Lerner
 
Big Data — Your new best friend
Reuven Lerner
 
PostgreSQL talk, Database 2011 conference
Reuven Lerner
 
What can Ruby learn from Python (and vice versa)?
Reuven Lerner
 
ActiveRecord 2.3
Reuven Lerner
 
Functional Python Webinar from October 22nd, 2014
Reuven Lerner
 
Web APIs: The future of software
Reuven Lerner
 
Rails console
Reuven Lerner
 
Dynamic languages, for software craftmanship group
Reuven Lerner
 
Python's magic methods
Reuven Lerner
 
PostgreSQL
Reuven Lerner
 
Technical training business talk.key
Reuven Lerner
 
Intro to cloud computing — MegaCOMM 2013, Jerusalem
Reuven Lerner
 
Ad

Similar to Git talk from Open 2011 conference in Israel (20)

PPT
Introduction to Git for developers
Dmitry Guyvoronsky
 
PDF
Introduction to Git
Yan Vugenfirer
 
KEY
Working with Git
Pete Nicholls
 
PDF
What the git? - SAP Inside Track Munich 2016
Hendrik Neumann
 
PDF
Embedded Systems: Lecture 11: Introduction to Git & GitHub (Part 2)
Ahmed El-Arabawy
 
PDF
Git SVN Migrate Reasons
Ovidiu Dimulescu
 
PPTX
Git Github GDSC.pptx
TusharChoudhary72015
 
PDF
Introduction to git, an efficient distributed version control system
AlbanLevy
 
PPTX
Git training (basic)
Arashdeepkaur16
 
ODP
Introduction to Git
Amit Mathur
 
PPT
CSE 390 Lecture 9 - Version Control with GIT
PouriaQashqai1
 
PDF
Git
Manjiri Tatke
 
PPT
Fundamentals and basics of Git and commands
DivyanshGupta922023
 
PDF
Git Pocket Guide A Working Introduction 1st Edition Richard E. Silverman
fingonbinka66
 
PPT
Introduction to Git
atishgoswami
 
PDF
Using GIT
WO Community
 
PPTX
Getting Started with Git: A Primer for SVN and TFS Users
Noam Kfir
 
PPTX
Git and github
Teodora Ahkozidou
 
PPT
Introduction to git
Nguyen Van Hung
 
KEY
Gitting the Most From Git
Chris Miller
 
Introduction to Git for developers
Dmitry Guyvoronsky
 
Introduction to Git
Yan Vugenfirer
 
Working with Git
Pete Nicholls
 
What the git? - SAP Inside Track Munich 2016
Hendrik Neumann
 
Embedded Systems: Lecture 11: Introduction to Git & GitHub (Part 2)
Ahmed El-Arabawy
 
Git SVN Migrate Reasons
Ovidiu Dimulescu
 
Git Github GDSC.pptx
TusharChoudhary72015
 
Introduction to git, an efficient distributed version control system
AlbanLevy
 
Git training (basic)
Arashdeepkaur16
 
Introduction to Git
Amit Mathur
 
CSE 390 Lecture 9 - Version Control with GIT
PouriaQashqai1
 
Git
Manjiri Tatke
 
Fundamentals and basics of Git and commands
DivyanshGupta922023
 
Git Pocket Guide A Working Introduction 1st Edition Richard E. Silverman
fingonbinka66
 
Introduction to Git
atishgoswami
 
Using GIT
WO Community
 
Getting Started with Git: A Primer for SVN and TFS Users
Noam Kfir
 
Git and github
Teodora Ahkozidou
 
Introduction to git
Nguyen Van Hung
 
Gitting the Most From Git
Chris Miller
 

More from Reuven Lerner (9)

PDF
PostgreSQL, your NoSQL database
Reuven Lerner
 
PDF
Rails israel 2013
Reuven Lerner
 
KEY
Rails traps
Reuven Lerner
 
KEY
Modern Web technologies (and why you should care): Megacomm, Jerusalem, Febru...
Reuven Lerner
 
KEY
Rails development environment talk
Reuven Lerner
 
KEY
Modern Web Technologies — Jerusalem Web Professionals, January 2011
Reuven Lerner
 
KEY
Ruby objects
Reuven Lerner
 
KEY
Rails tools
Reuven Lerner
 
KEY
Why ruby and rails
Reuven Lerner
 
PostgreSQL, your NoSQL database
Reuven Lerner
 
Rails israel 2013
Reuven Lerner
 
Rails traps
Reuven Lerner
 
Modern Web technologies (and why you should care): Megacomm, Jerusalem, Febru...
Reuven Lerner
 
Rails development environment talk
Reuven Lerner
 
Modern Web Technologies — Jerusalem Web Professionals, January 2011
Reuven Lerner
 
Ruby objects
Reuven Lerner
 
Rails tools
Reuven Lerner
 
Why ruby and rails
Reuven Lerner
 

Recently uploaded (20)

PDF
Diabetes mellitus diagnosis method based random forest with bat algorithm
IAESIJAI
 
PDF
Dropbox Q2 2025 Financial Results & Investor Presentation
Dropbox
 
PPTX
KOM of Painting work and Equipment Insulation REV00 update 25-dec.pptx
muhammadmuneebnaeem7
 
PPTX
Understanding_Digital_Forensics_Presentation.pptx
ImranKhan423233
 
PDF
Empathic Computing: Creating Shared Understanding
Mark Billinghurst
 
PPTX
20250228 LYD VKU AI Blended-Learning.pptx
DatVoNgoc
 
PDF
Architecting across the Boundaries of two Complex Domains - Healthcare & Tech...
Peter Tan
 
PDF
NewMind AI Weekly Chronicles - August'25 Week I
NewMind AI
 
PDF
Bridging biosciences and deep learning for revolutionary discoveries: a compr...
IAESIJAI
 
PDF
Electronic commerce courselecture one. Pdf
OmerMohamed64
 
PDF
Chapter 3 Spatial Domain Image Processing.pdf
Getnet Tigabie Askale -(GM)
 
PDF
7 ChatGPT Prompts to Help You Define Your Ideal Customer Profile.pdf
SOFTTECHHUB
 
PDF
Spectral efficient network and resource selection model in 5G networks
IAESIJAI
 
PDF
Approach and Philosophy of On baking technology
30anthuong17
 
PDF
Machine learning based COVID-19 study performance prediction
IAESIJAI
 
PPTX
Detection-First SIEM: Rule Types, Dashboards, and Threat-Informed Strategy
ReZa AdineH
 
PPTX
PA Analog/Digital System: The Backbone of Modern Surveillance and Communication
AVTRON Technologies LLC
 
PDF
Encapsulation_ Review paper, used for researhc scholars
gurumoop
 
PDF
Advanced methodologies resolving dimensionality complications for autism neur...
IAESIJAI
 
PDF
Reach Out and Touch Someone: Haptics and Empathic Computing
Mark Billinghurst
 
Diabetes mellitus diagnosis method based random forest with bat algorithm
IAESIJAI
 
Dropbox Q2 2025 Financial Results & Investor Presentation
Dropbox
 
KOM of Painting work and Equipment Insulation REV00 update 25-dec.pptx
muhammadmuneebnaeem7
 
Understanding_Digital_Forensics_Presentation.pptx
ImranKhan423233
 
Empathic Computing: Creating Shared Understanding
Mark Billinghurst
 
20250228 LYD VKU AI Blended-Learning.pptx
DatVoNgoc
 
Architecting across the Boundaries of two Complex Domains - Healthcare & Tech...
Peter Tan
 
NewMind AI Weekly Chronicles - August'25 Week I
NewMind AI
 
Bridging biosciences and deep learning for revolutionary discoveries: a compr...
IAESIJAI
 
Electronic commerce courselecture one. Pdf
OmerMohamed64
 
Chapter 3 Spatial Domain Image Processing.pdf
Getnet Tigabie Askale -(GM)
 
7 ChatGPT Prompts to Help You Define Your Ideal Customer Profile.pdf
SOFTTECHHUB
 
Spectral efficient network and resource selection model in 5G networks
IAESIJAI
 
Approach and Philosophy of On baking technology
30anthuong17
 
Machine learning based COVID-19 study performance prediction
IAESIJAI
 
Detection-First SIEM: Rule Types, Dashboards, and Threat-Informed Strategy
ReZa AdineH
 
PA Analog/Digital System: The Backbone of Modern Surveillance and Communication
AVTRON Technologies LLC
 
Encapsulation_ Review paper, used for researhc scholars
gurumoop
 
Advanced methodologies resolving dimensionality complications for autism neur...
IAESIJAI
 
Reach Out and Touch Someone: Haptics and Empathic Computing
Mark Billinghurst
 

Git talk from Open 2011 conference in Israel

  • 1. Git Reuven M. Lerner • reuven@lerner.co.il Open Israel Conference June 30th, 2011
  • 2. Who am I? • Web developer, software architect, consultant, lecturer/trainer • Linux Journal columnist since 1996 • Mostly Ruby on Rails + PostgreSQL, but also Python, PHP, jQuery, and lots more... • Git user (and enthusiast) since 2008
  • 4. Time machine • Return to any point in a project’s history • Find out how files, folders have changed • Learn which user made which changes
  • 5. Backup • Never fear that you’ve deleted a file — just rewind the history • Everything is recorded, can be undone
  • 6. Maintenance tool • “Tag” releases • Who is to blame for a particular bug? • When did we introduce a particular problem? • Deploy specific versions on specific servers
  • 7. Scratchpad • Try out new ideas • Experiment with alternative techniques • Upgrade a library • Refactor without affecting the “live” code base
  • 8. Collaboration tool • Work without fear of “stomping” on someone else’s code • Identify conflicts between what developers wrote • Mix and match teams for projects
  • 9. Version control is great • If you’re a programmer and not using version control, you’re really missing out • It’s also good for non-programs, such as configuration files • If you’re a CTO/team leader/VP R&D and your people aren’t using version control, you’re inviting disaster
  • 10. What do people use? • RCS (ancient history) • CVS (should be ancient history) • Subversion (“a better CVS”) • SourceSafe • Perforce • lots of other systems
  • 11. Problems with these • Work requires a server connection • (You can work, but not commit.) • Branching and merging is painful and slow • So no one does it! • Enforces a particular workflow • More code, more developers — slower VC
  • 12. Distributed version control • Distributed: Everyone is their own server! • Everyone has a complete commit history • No single point of failure • Commit whenever you want (i.e., often) • Merge when two repositories connect
  • 13. Git • Linus needed a VCS... so he wrote one! • Fast • Accurate • Distributed • Massively scalable • Super flexible
  • 14. Open-source Git users • Linux kernel • PostgreSQL • Ruby language • Ruby on Rails • Perl language • among many, many others
  • 15. Give me details! • What does Git do that others don’t? • Why do I claim that Git has changed my life?
  • 16. Branching & merging • Branching and merging is both easy and fast in Git • I often branch and merge several times in a given day • When I used SVN, I would do everything in my power to avoid branching, because merges were long and difficult
  • 17. Branching & merging • Create a branch: git checkout -b new-branch • Merge commits from other-branch git merge other-branch • Yes, it’s really that easy. • You don’t even have to change directories!
  • 18. Easy branching changes everything! • Every new feature goes in a branch • Merging becomes easy, fast, and natural • Side projects are stored, not kept out of version control for fear of “contamination” • Commit, commit, commit all of the time, in an appropriate branch — never lose work!
  • 19. Local repository is great • Work without a network connection • Commits, merges, and switching branches are nearly instantaneous • Reports and logs are super-fast • “Show me all files modified on Tuesday of last week” produces immediate resultss
  • 20. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 21. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 22. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 23. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 24. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 25. Create a repository! /tmp $ cd myapp /tmp/myapp $ git init Initialized empty Git repository in /private/tmp/myapp/.git/ master ✗ /tmp/myapp $ git add . master ✗ /tmp/myapp $ git commit -a -m 'Initial commit' [master (root-commit) 030c6b6] Initial commit 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 foo Initial commit master ✔ /tmp/myapp $
  • 26. The result master ✔ /tmp/myapp $ git log commit 030c6b691993e0f43d78119d9ff1c9e759120d11 Author: Reuven Lerner <reuven@lerner.co.il> Date: Thu Jun 30 12:29:29 2011 +0300 I
  • 27. Committing in stages • You can commit all modified files (“git commit -a”) • You can add files to be committed (“git add foo.rb”) over time • Using the staging area gives you tremendous flexibility before committing
  • 28. Remote branches • A local branch can “track” a remote branch • Different branches can be on different servers — and then you can merge across them • One possible workflow: Read from one remote branch, and write to another
  • 29. Integration • Git is all small Unix commands • Easily integrated into text editors, IDEs, cron jobs, monitoring, and system tasks • Example: Continuous integration servers • Example: Code-analysis tools • Also: Front ends to SVN and others!
  • 30. git blame • Shows the commit, user, and timestamp of when each line of a file was changed • Useful when you want to know who broke the build • Also useful for deflecting blame from clients, who think you broke something!
  • 31. a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
  • 32. Commit a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
  • 33. Commit User a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
  • 34. Commit User Timestamp a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
  • 35. Commit User Timestamp Line # and code a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 29) a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 30) #ifdef WIN32 65e806cb (Bruce Momjian 2010-02-26 02:01:40 +0000 31) #define FD_SETSIZE 1024 a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 32) #endif /* ! WIN32 */ a23c6415 (Magnus Hagander 2009-07-30 09:28:00 +0000 33) d08741ea (Tom Lane 2001-02-10 02:31:31 +0000 34) #include "postgres_fe.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 35) a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 36) #include "libpq-fe.h" a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 37) #include "libpq/pqsignal.h" 3da0dfb4 (Tatsuo Ishii 2009-08-03 15:18:14 +0000 38) #include "portability/instr_time.h" a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 39) d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 40) #include <ctype.h> d156e1f8 (Tom Lane 2005-10-07 15:34:17 +0000 41) a8a198b1 (Itagaki Takahiro 2010-01-06 01:30:03 +0000 42) #ifndef WIN32 a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 43) #include <sys/time.h> a765db40 (Tatsuo Ishii 2000-01-15 12:38:09 +0000 44) #include <unistd.h> ffda6747 (Tom Lane 2007-09-27 20:39:43 +0000 45) #endif /* ! WIN32 */
  • 36. git bisect • You introduced a bug, but don’t know where? Git can find it! • Give two endpoints • Git does a binary search between them • For each commit, tell Git whether it is “good” or “bad” • This finds the bug very quickly
  • 37. Stash • Temporary storage space • Useful if you have done enough work to keep, but not enough for a commit • Emergency fixes in the middle of working on something else • If you need, put the stash into a new branch • Oh, you can have multiple stashes
  • 38. Hooks • Execute arbitrary code when things happen • Example: Update submodules automatically • Example: Send e-mail after a commit • Example: Heroku uses hooks to deploy a new version of your Web app when you push to them!
  • 39. Workflows • Git supports many, many workflows • Traditional centralized server • BDFL and users • BDFL and Lieutenants • Do what works for you!
  • 43. Cherry picking • You can merge specific commits, or parts of commits • Amazingly powerful
  • 44. Rebase • An alternative to regular merging • First merge all external commits, then replay your changes on top • Helps to keep you aligned with remote branches • Avoids some merge-conflict issues
  • 45. Submodules • A Git repository can point to other repositories — submodules • Break a project into smaller projects • Git puts the pieces together for you!
  • 46. Amending commits • Commits are not sacred in Git • Rather, they are a tool to manage history • Change, amend, and edit commits • Yes, this can be dangerous! • Also avoids hundreds of “fixed typo” commits in a row...
  • 47. Commercial hosting • You can host Git repositories on your own • Want to go commercial? GitHub, Gitorious, and many others work great • GitHub is free for open-source projects, and thus very popular
  • 49. GUIs • Yes, there are now GUIs for Git • Windows, Mac, and Unix versions all exist • Integration with Emacs and other editors for hard-core hacker-nerds • Also: Shell-prompt integration for Unix
  • 50. In short • Git has completely changed how I develop code, both alone and with others • The speed and easy branching/merging are game-changers • It’s really not that hard to start using... • ... and once you start, you’ll never want to go back to CVS or SVN
  • 51. Want to learn more? • Mailing lists, wikis, and blogs • http://git-scm.com/ • http://progit.org/ • http://gitimmersion.com/ • I’m probably going to offer Git training soon — let me know if you’re interested!
  • 52. Thanks! (Any questions?) reuven@lerner.co.il http://www.lerner.co.il/ 054-496-8405 “reuvenlerner” on Skype/AIM

Editor's Notes