EK
Uploaded byElli Kanal
4,912 views

Git tutorial

This document provides an overview of Git and GitHub for code versioning and sharing. It discusses key Git concepts like branches, commits, and merges. It also demonstrates how to perform basic Git commands from the command line interface. GitHub is presented as a tool for easy collaboration on Git projects through features like forking and pull requests. Overall the document serves as an introduction to using Git and GitHub for researchers and code sharing.

Embed presentation

Downloaded 227 times
ioning You r Code: Vers Git and Github™: Code Management and Sharing for Researchers using Git Eliezer Kanal 10/24/2011 and Github (™)
Slides available online! !""#$%%"&'()*+,-./%-'0-1&"2
What is Versioning? • Keeping track of changes to your code • Documenting those changes • You’re probably doing it now...
Why Change? • Troubleshooting • Logging • Simplify adding features • Simplify code sharing
What is Git? • DVCS = Distributed Version Control System • Technique for managing large/small coding projects Large Me, >1 million other Small people
What is Git? • Two parts: 1. “Database” (hidden folder) to hold project history 2. Set of tools to interact with database • Used via Command Line or GUI interfaces
What does Git do? • Retain file history
What does Git do? • Retain^filedhistory e distribut
What does Git do? • Branching & Merging version 1 version 2 version 3 version 4 version 5 version 4b version 4b.2 nch new feature bra
Case Study – Analysis toolkit • Improve interface, ~2 days work - …while analyzing data • Branch! - Improvements on “development” branch - Work on “main” branch - Merge when feature completed
Case Study – Productivity tool • 13"45!&"46.'3: productivity bad word! tool, on 1&"!)0,-./ • Downloaded, found bug • Fixed bug, multiple local check-ins • Sent change histories back via 1&"!)0,-./
Case Study – Productivity tool • 13"45!&"46.'3: productivity bad word! tool, on 1&"!)0,-./ • Downloaded, found bug • Fixed bug, multiple local check-ins • Sent change histories back via 1&"!)0,-./
How Git can help YOU * • Personally: • CNBC as a group: - Keep track of changes - “Don’t reinvent the wheel” - Fix bugs quicker - More eyes → better code - Share code easier - Collaboration - Simplify adding new features/changing code * Or Mercurial, or Bazaar, or Monotone, or LibreSource, or...
This slide intentionally left blank
Git Usage
Key Concepts Things “about History, Same as Work is to be stored” branches are Repository, done here are put here stored here but remote 781&"8#)5! 781&"8966 781&"8-.//&" 781&"8#)++ Staging Workspace Repository Remote Area
• Create & edit some code /9"!,/ :)'-"&.'8/9"!;< *3")*'8=>=?
• Move code to Staging Area • Commit code
• Make changes, start working on new code /9"!,/ :)'-"&.'8/9"!;< #*&'",/ :)'-"&.'8#*&'";9< *3")*'8=>=? /9"!,/ 3-!.89? :)'-"&.'8/9"!;9@0< *3")*'89>0?
…wash, rinse, repeat: • Move completed code to “Staging Area” - Leave the rest “unstaged” • Commit code
Key Concepts • Finder (Explorer) not suited for Git - Are these in the workspace or staging area? - What branch are we on? - What revision is this? Not enough information!
Git Interface • Command line • GUI - Github for Mac (signific antly ) differe ntly ightly All work sl - GitExtensions - Others
Example Usage • Starting work on /(A*.B3-": Terminal 78-68/(A*.B3-" 781&"8&'&"8 That’s it!
Command Line Interface
• Create & edit some code /9"!,/ :)'-"&.'8/9"!;< *3")*'8=>=?
• Code is in working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
• Code is in working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
• Code is in working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
• Code is in working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
• Make changes, add new code /9"!,/ :)'-"&.'8/9"!;< #*&'",/ :)'-"&.'8#*&'";9< *3")*'8=>=? /9"!,/ 3-!.89? :)'-"&.'8/9"!;9@0< *3")*'89>0?
• See what we’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
• See what we’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
• See what we’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
• Add... Terminal 781&"89668/9"!,/ 781&"89668#*&'",/ 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358".8038-.//&""36$ E888;)538H1&"8*353"8NOPQ8I:&+3J,,,H8".8)'5"913< E E8 /.6&:&36$888/9"!,/ E8 '3K8:&+3$888#*&'",/ E
• Add... Terminal 781&"89668/9"!,/ 781&"89668#*&'",/ 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358".8038-.//&""36$ E888;)538H1&"8*353"8NOPQ8I:&+3J,,,H8".8)'5"913< E E8 /.6&:&36$888/9"!,/ E8 '3K8:&+3$888#*&'",/ E
• …and Commit Terminal 781&"8-.//&"84/8R966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.'R T/95"3*89U3-VW9X8966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.' 8=8:&+358-!9'136@8=8&'53*"&.'5;><@8W863+3"&.'5;4< 8-*39"38/.638=WWVYY8#*&'",/
• …and Commit Terminal 781&"8-.//&"84/8R966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.'R T/95"3*89U3-VW9X8966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.' 8=8:&+358-!9'136@8=8&'53*"&.'5;><@8W863+3"&.'5;4< 8-*39"38/.638=WWVYY8#*&'",/
• Let’s see what we’ve done... Terminal 781&"8+.1 -.//&"89U3-VW9ZVU:6VY3=[ZU9WVW=6U[2[03V]U:-U99 P)"!.*$8O+&3^3*8_9'9+8I3M9'9+`-/),36)J Q9"3$888a!)8b)'8=V8=[$=$2=82W==84WYWW 8888966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.' -.//&"8603[]WW]9303V000[30:0-]9=]VY=6]2ZWW P)"!.*$8O+&3^3*8_9'9+8I3M9'9+`-/),36)J Q9"3$888a!)8b)'8=V8=[$==$WY82W==84WYWW 8888-*39"368/9"!8:)'-"&.'
Git Workflow – Complete • Do some work • See what you’ve changed, verify things look good: re out 781&"85"9")5 Home work: figu does 781&"86&::"..+8I:&+3'9/35J what this • Tell Git what you’re ready to commit: 781&"89668I:&+3'9/35J • Commit & log changes: 781&"8-.//&"8I:&+3'9/35J !"#$%&'(&%)$*&('*+,'-+%&./
Github for Mac™
Branches • Question: How can we integrate new features without messing up our current working code? • Branches let us work in a “new directory” which we can later either delete or merge.
Branches & Tags • Think of branches as separate folders, each with it’s own content and history.
Branches – Go Nuts
Branches & Merges • If a branch is a split in the graph, then merge is a merging of split branches • One single command (SVN users rejoice!) • Conflicts: Same code was changed in both branches • Fix by hand, re-try the merge. - !""#$%%KKK,M3*'3+,.*1%#)0%5.:"K9*3%5-/%1&"%6.-5%)53*4 /9')9+,!"/+E*35.+S&'1494/3*13 - better idea: Google “fixing a git merge conflict”
Branches & Merges • Conflicts: Same code was changed in both branches • Merge fails! • Fix by hand, re-try the merge - !""#$%%KKK,M3*'3+,.*1%#)0%5.:"K9*3%5-/%1&"%6.-5%)53*4 /9')9+,!"/+E*35.+S&'1494/3*13 - better idea: Search “fixing a git merge conflict”
c&"!)0,-./ git·hub /'ɡɪtˌhʌb/ GitHub is the best way to collaborate with others. Fork, send pull requests and manage all your public and private git repositories.
c&"!)0,-./ • Very easy collaboration • Clear, detailed setup instructions 4 !""#$%%!3+#,1&"!)0,-./% • Easy “forking” for Github projects - Get your own copy of their code - Contribute back with “pull requests”
Demo
SVN integration • Very easy to move from SVN → Git • Works best as one-time deal, can work side-by-side • !""#$%%.*35"&5,1*%0+.1%2WWU%WU%2%1&"45S'4")".*&9+%
Good Git Practice • Check in often! - Rule of thumb… check in whenever code works • Write detailed log notes! You’ll thank yourself for it later! • Branch for new features - Avoid working on the master branch, it should always be the “clean, working” code
References • Pro Git - free online: ! !""#$%%#*.1&",.*1%0..M% • Branching: ! !""#$%%'S&3,-./%#.5"5%945)--355:)+41&"40*9'-!&'14/.63+% • Git tutorials and useful FAQ links: ! !""#$%%5&d*3S&5&.'5,-./%*35.)*-35%1&"4")".*&9+54031&''3*5% • Github: ! !""#$%%1&"!)0,-./% • Git-SVN integration: ! !""#$%%.*35"&5,1*%0+.1%2WWU%WU%2%1&"45S'4")".*&9+% • Google: ! !""#$%%1..1+3,-./% • Bing: ! !""#$%%0&'1,-./%
Git Hands-On
Git Setup – one-time Recommend downloading xcode, just for the FileMerge program (“opendiff” when launched from command line) • Identify yourself to Git: 781&"8-.':&18441+.09+8)53*,'9/38He.)*8f9/3H88 781&"8-.':&18441+.09+8)53*,3/9&+8H(.)*`3/9&+,-./H8 All your work is logged using the name/email you provide here. • Give Git some color to make things easier to read: 781&"8-.':&18441+.09+8-.+.*,)&89)".8 • Line-ending bandaids: 781&"8-.':&18441+.09+8-.*3,59:3-*+:8"*)38 781&"8-.':&18441+.09+8-.*3,9)".-*+:8&'#)" “"*)3” Windows users: use “&'#)"” instead of
Git Setup • Begin using Git for a project: 78-68#*.B3-"g.+63*% 781&"8&'&" h'&"&9+&^3683/#"(8c&"8*3#.5&".*(8&'8%#*.B3-"g.+63*%,1&"% Creates the (hidden) ,1&" folder. No files being tracked yet. • Add files to repository: 781&"89668, 781&"8-.//&"84/8i:&*5"8-.//&"j Instructs Git to manage all files in the folder %#*.B3-"g.+63*%.

More Related Content

PDF
Git real slides
byLucas Couto
 
PPTX
Git - Basic Crash Course
byNilay Binjola
 
PPTX
Git 101 for Beginners
byAnurag Upadhaya
 
PPTX
Basic Git Intro
byYoad Snapir
 
PPTX
Git One Day Training Notes
byglen_a_smith
 
PPTX
Introduction git
byDian Sigit Prastowo
 
PPTX
Git basics to advance with diagrams
byDilum Navanjana
 
PPTX
Intro to git and git hub
byVenkat Malladi
 
Git real slides
byLucas Couto
 
Git - Basic Crash Course
byNilay Binjola
 
Git 101 for Beginners
byAnurag Upadhaya
 
Basic Git Intro
byYoad Snapir
 
Git One Day Training Notes
byglen_a_smith
 
Introduction git
byDian Sigit Prastowo
 
Git basics to advance with diagrams
byDilum Navanjana
 
Intro to git and git hub
byVenkat Malladi
 

What's hot

KEY
Introduction to Git
byLukas Fittl
 
PDF
Git for beginners
byArulmurugan Rajaraman
 
PDF
Git & GitHub WorkShop
bySheilaJimenezMorejon
 
PDF
Git - An Introduction
byBehzad Altaf
 
PDF
Git training v10
bySkander Hamza
 
PPTX
Git in 10 minutes
bySafique Ahmed Faruque
 
PPT
Git basic
byEmran Ul Hadi
 
PDF
Git and Github
byWen-Tien Chang
 
PPTX
Introduction to Gitlab | Gitlab 101 | Training Session
byAnwarul Islam
 
PDF
Starting with Git & GitHub
byNicolás Tourné
 
KEY
Introduction To Git
byArnaud Seilles
 
PDF
Git basics
byGHARSALLAH Mohamed
 
PDF
Git 101: Git and GitHub for Beginners
byHubSpot
 
PPTX
Git & GitLab
byGaurav Wable
 
PPTX
Git and Github Session
byGoogleDevelopersStud1
 
PDF
Git Introduction Tutorial
byThomas Rausch
 
PDF
Github - Git Training Slides: Foundations
byLee Hanxue
 
PPTX
Git n git hub
byJiwon Baek
 
PDF
git and github
byDarren Oakley
 
PDF
Git and Github slides.pdf
byTilton2
 
Introduction to Git
byLukas Fittl
 
Git for beginners
byArulmurugan Rajaraman
 
Git & GitHub WorkShop
bySheilaJimenezMorejon
 
Git - An Introduction
byBehzad Altaf
 
Git training v10
bySkander Hamza
 
Git in 10 minutes
bySafique Ahmed Faruque
 
Git basic
byEmran Ul Hadi
 
Git and Github
byWen-Tien Chang
 
Introduction to Gitlab | Gitlab 101 | Training Session
byAnwarul Islam
 
Starting with Git & GitHub
byNicolás Tourné
 
Introduction To Git
byArnaud Seilles
 
Git basics
byGHARSALLAH Mohamed
 
Git 101: Git and GitHub for Beginners
byHubSpot
 
Git & GitLab
byGaurav Wable
 
Git and Github Session
byGoogleDevelopersStud1
 
Git Introduction Tutorial
byThomas Rausch
 
Github - Git Training Slides: Foundations
byLee Hanxue
 
Git n git hub
byJiwon Baek
 
git and github
byDarren Oakley
 
Git and Github slides.pdf
byTilton2
 

Viewers also liked

PPTX
Introduction to Git/Github - A beginner's guide
byRohit Arora
 
PPT
Git 101 - Crash Course in Version Control using Git
byGeoff Hoffman
 
PPTX
Git tutorial
byTingYen Lee
 
PDF
Quick Introduction to git
byJoel Krebs
 
PDF
Introduction to Git (part 1)
bySalvatore Cordiano
 
PDF
Git 101 tutorial presentation
byTerry Wang
 
PDF
Git cheat sheet
byBirtan Yıldız
 
PPTX
Gitlab
byTom Chen
 
PDF
Mini-tutorial de git
byAntonio Ognio
 
PPT
Gastrointestinal disorders 2
byMD Specialclass
 
PPT
Gastrointestinal disease
byIAU Dent
 
PDF
Git Tutorial 教學
byWen-Tien Chang
 
PDF
Introduction to git
byRandal Schwartz
 
PDF
Gitlab Training with GIT and SourceTree
byTeerapat Khunpech
 
PPT
Gastrointestinal System Disorders
byJessie Madz
 
PDF
Git tutorial
bymobaires
 
PPT
Gastrointestinal disease lecture(ppt)
byRazavi Nader
 
Introduction to Git/Github - A beginner's guide
byRohit Arora
 
Git 101 - Crash Course in Version Control using Git
byGeoff Hoffman
 
Git tutorial
byTingYen Lee
 
Quick Introduction to git
byJoel Krebs
 
Introduction to Git (part 1)
bySalvatore Cordiano
 
Git 101 tutorial presentation
byTerry Wang
 
Git cheat sheet
byBirtan Yıldız
 
Gitlab
byTom Chen
 
Mini-tutorial de git
byAntonio Ognio
 
Gastrointestinal disorders 2
byMD Specialclass
 
Gastrointestinal disease
byIAU Dent
 
Git Tutorial 教學
byWen-Tien Chang
 
Introduction to git
byRandal Schwartz
 
Gitlab Training with GIT and SourceTree
byTeerapat Khunpech
 
Gastrointestinal System Disorders
byJessie Madz
 
Git tutorial
bymobaires
 
Gastrointestinal disease lecture(ppt)
byRazavi Nader
 

Similar to Git tutorial

PDF
Git for the Android Developer
byEffective
 
PDF
Git for the Android Developer
byEffectiveUI
 
PDF
SCM for Android Developers Using Git
byTony Hillerson
 
PDF
Git cheat-sheets
byozone777
 
PPTX
Git basic stanley hsiao 2010_12_15
byChen-Han Hsiao
 
PDF
Git For The Android Developer
byEffective
 
PPTX
Source control management
byOwen Winkler
 
PDF
Git, GitHub and Open Source
byLorna Mitchell
 
ODP
Introduction to Git
byAmit Mathur
 
PDF
Intro to Git
byojtibi
 
PPT
Git
byVijay Kani
 
PPTX
Git 101 for_tarad_dev
bySomkiat Puisungnoen
 
PDF
Introduction to git, an efficient distributed version control system
byAlbanLevy
 
PPTX
Git training (basic)
byArashdeepkaur16
 
PPT
Getting started with GIT
bypratz0909
 
PPTX
Git_new.pptx
byBruceLee275640
 
PPT
CSE 390 Lecture 9 - Version Control with GIT
byPouriaQashqai1
 
ZIP
Beginner's Guide to Version Control with Git
byRobert Lee-Cann
 
KEY
Git Tech Talk
byChris Johnson
 
PPTX
GIT.pptx
bySoumen Debgupta
 
Git for the Android Developer
byEffective
 
Git for the Android Developer
byEffectiveUI
 
SCM for Android Developers Using Git
byTony Hillerson
 
Git cheat-sheets
byozone777
 
Git basic stanley hsiao 2010_12_15
byChen-Han Hsiao
 
Git For The Android Developer
byEffective
 
Source control management
byOwen Winkler
 
Git, GitHub and Open Source
byLorna Mitchell
 
Introduction to Git
byAmit Mathur
 
Intro to Git
byojtibi
 
Git
byVijay Kani
 
Git 101 for_tarad_dev
bySomkiat Puisungnoen
 
Introduction to git, an efficient distributed version control system
byAlbanLevy
 
Git training (basic)
byArashdeepkaur16
 
Getting started with GIT
bypratz0909
 
Git_new.pptx
byBruceLee275640
 
CSE 390 Lecture 9 - Version Control with GIT
byPouriaQashqai1
 
Beginner's Guide to Version Control with Git
byRobert Lee-Cann
 
Git Tech Talk
byChris Johnson
 
GIT.pptx
bySoumen Debgupta
 

Recently uploaded

PDF
How does MES(Manufacturing Execution System) work?
byakipii ogaoga
 
PDF
Agent to agent service discovery using HashiCorp Consul and Vault
byBram Vogelaar
 
PPTX
CTO Strategy OS 2026: The Tech, AI & Cloud Playbook Boards Want
byridwansassman
 
PDF
Odoo Implementation Checklist: A Strategic ERP Blueprint for Business-Ready D...
byBANIBRO IT SOLUTION
 
PPTX
Do You Control the AI, or Does the AI Control You?
bymedhateltoukhy
 
PPTX
GenerationAI Paris 2025 | AI in Tech: Beyond Expectations, Into Execution
byapidays
 
PDF
Oracle Cloud Infrastructure 2025 Architect Professional (1Z0-1127-25) Master ...
byExamCert App
 
PDF
Explaining specific examples of purpose-specific BOM
byakipii ogaoga
 
PPTX
Spacecraft Guidance Quick Research Guide by Arthur Morgan
byArthur Morgan
 
PDF
GenerationAI_Paris_2025_Architecting_Intelligence.pdf
byapidays
 
PDF
apidays New York 2025 | AI in Application Security
byapidays
 
PDF
20260212 Security-JAWS activity results for 2025 and activity goals for 2026
byTyphon 666
 
PDF
apidays Paris 2025 | Zero Trust By Design
byapidays
 
PDF
Transcript: Escape from the Forbidden Zone: Smuggling green and inclusive tec...
byBookNet Canada
 
PPTX
Celonis Optimizing your future with process
bydevjeremyappleyard
 
PDF
Effortless Distributed Systems with Aspire.pdf
byParticular Software
 
PDF
Chapter 5 Security Mechanisms iin computer security.pdf
byGetnet Tigabie Askale -(GM)
 
PDF
Constraint Collapse and Fidelity Decay in Scaled Language Models
bySemantic Fidelity Lab | A. Jacobs
 
PDF
February 2026 Patch Tuesday hosted by Chris Goettl and Todd Schell
byIvanti
 
PPTX
apidays Paris 2025 | Building Agentic Workflows
byapidays
 
How does MES(Manufacturing Execution System) work?
byakipii ogaoga
 
Agent to agent service discovery using HashiCorp Consul and Vault
byBram Vogelaar
 
CTO Strategy OS 2026: The Tech, AI & Cloud Playbook Boards Want
byridwansassman
 
Odoo Implementation Checklist: A Strategic ERP Blueprint for Business-Ready D...
byBANIBRO IT SOLUTION
 
Do You Control the AI, or Does the AI Control You?
bymedhateltoukhy
 
GenerationAI Paris 2025 | AI in Tech: Beyond Expectations, Into Execution
byapidays
 
Oracle Cloud Infrastructure 2025 Architect Professional (1Z0-1127-25) Master ...
byExamCert App
 
Explaining specific examples of purpose-specific BOM
byakipii ogaoga
 
Spacecraft Guidance Quick Research Guide by Arthur Morgan
byArthur Morgan
 
GenerationAI_Paris_2025_Architecting_Intelligence.pdf
byapidays
 
apidays New York 2025 | AI in Application Security
byapidays
 
20260212 Security-JAWS activity results for 2025 and activity goals for 2026
byTyphon 666
 
apidays Paris 2025 | Zero Trust By Design
byapidays
 
Transcript: Escape from the Forbidden Zone: Smuggling green and inclusive tec...
byBookNet Canada
 
Celonis Optimizing your future with process
bydevjeremyappleyard
 
Effortless Distributed Systems with Aspire.pdf
byParticular Software
 
Chapter 5 Security Mechanisms iin computer security.pdf
byGetnet Tigabie Askale -(GM)
 
Constraint Collapse and Fidelity Decay in Scaled Language Models
bySemantic Fidelity Lab | A. Jacobs
 
February 2026 Patch Tuesday hosted by Chris Goettl and Todd Schell
byIvanti
 
apidays Paris 2025 | Building Agentic Workflows
byapidays
 

Git tutorial

  • 1.
    ioning You rCode: Vers Git and Github™: Code Management and Sharing for Researchers using Git Eliezer Kanal 10/24/2011 and Github (™)
  • 2.
  • 3.
    What is Versioning? •Keeping track of changes to your code • Documenting those changes • You’re probably doing it now...
  • 4.
    Why Change? • Troubleshooting •Logging • Simplify adding features • Simplify code sharing
  • 5.
    What is Git? •DVCS = Distributed Version Control System • Technique for managing large/small coding projects Large Me, >1 million other Small people
  • 6.
    What is Git? •Two parts: 1. “Database” (hidden folder) to hold project history 2. Set of tools to interact with database • Used via Command Line or GUI interfaces
  • 7.
    What does Gitdo? • Retain file history
  • 8.
    What does Gitdo? • Retain^filedhistory e distribut
  • 9.
    What does Gitdo? • Branching & Merging version 1 version 2 version 3 version 4 version 5 version 4b version 4b.2 nch new feature bra
  • 10.
    Case Study –Analysis toolkit • Improve interface, ~2 days work - …while analyzing data • Branch! - Improvements on “development” branch - Work on “main” branch - Merge when feature completed
  • 11.
    Case Study –Productivity tool • 13"45!&"46.'3: productivity bad word! tool, on 1&"!)0,-./ • Downloaded, found bug • Fixed bug, multiple local check-ins • Sent change histories back via 1&"!)0,-./
  • 12.
    Case Study –Productivity tool • 13"45!&"46.'3: productivity bad word! tool, on 1&"!)0,-./ • Downloaded, found bug • Fixed bug, multiple local check-ins • Sent change histories back via 1&"!)0,-./
  • 13.
    How Git canhelp YOU * • Personally: • CNBC as a group: - Keep track of changes - “Don’t reinvent the wheel” - Fix bugs quicker - More eyes → better code - Share code easier - Collaboration - Simplify adding new features/changing code * Or Mercurial, or Bazaar, or Monotone, or LibreSource, or...
  • 14.
  • 15.
  • 16.
    Key Concepts Things “about History, Same as Work is to be stored” branches are Repository, done here are put here stored here but remote 781&"8#)5! 781&"8966 781&"8-.//&" 781&"8#)++ Staging Workspace Repository Remote Area
  • 17.
    • Create &edit some code /9"!,/ :)'-"&.'8/9"!;< *3")*'8=>=?
  • 18.
    • Move codeto Staging Area • Commit code
  • 19.
    • Make changes,start working on new code /9"!,/ :)'-"&.'8/9"!;< #*&'",/ :)'-"&.'8#*&'";9< *3")*'8=>=? /9"!,/ 3-!.89? :)'-"&.'8/9"!;9@0< *3")*'89>0?
  • 20.
    …wash, rinse, repeat: • Move completed code to “Staging Area” - Leave the rest “unstaged” • Commit code
  • 21.
    Key Concepts • Finder(Explorer) not suited for Git - Are these in the workspace or staging area? - What branch are we on? - What revision is this? Not enough information!
  • 22.
    Git Interface • Commandline • GUI - Github for Mac (signific antly ) differe ntly ightly All work sl - GitExtensions - Others
  • 23.
    Example Usage • Startingwork on /(A*.B3-": Terminal 78-68/(A*.B3-" 781&"8&'&"8 That’s it!
  • 24.
  • 25.
    • Create &edit some code /9"!,/ :)'-"&.'8/9"!;< *3")*'8=>=?
  • 26.
    • Code isin working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
  • 27.
    • Code isin working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
  • 28.
    • Code isin working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
  • 29.
    • Code isin working state; ready for “commit” Terminal 781&"89668/9"!,/ 781&"8-.//&"84/8C-*39"368/9"!8:)'-"&.'D
  • 30.
    • Make changes,add new code /9"!,/ :)'-"&.'8/9"!;< #*&'",/ :)'-"&.'8#*&'";9< *3")*'8=>=? /9"!,/ 3-!.89? :)'-"&.'8/9"!;9@0< *3")*'89>0?
  • 31.
    • See whatwe’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
  • 32.
    • See whatwe’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
  • 33.
    • See whatwe’ve done Terminal 781&"85"9")5 E8F'80*9'-!8/95"3* E8G!9'1358'."85"91368:.*8-.//&"$ E8;)538H1&"89668I:&+3J,,,H8".8)#69"38K!9"8K&++8038-.//&""36< E E8 /.6&:&36$8/9"!,/ E E8L'"*9-M368:&+35$ E888;)538H1&"89668I:&+3J,,,H8".8&'-+)638&'8K!9"8K&++8038-.//&""36< E E8 #*&'",/ '.8-!9'1358966368".8-.//&"8;)538H1&"8966H89'6%.*8H1&"8-.//&"849H<
  • 34.
  • 35.
  • 36.
  • 37.
  • 38.
    • Let’s seewhat we’ve done... Terminal 781&"8+.1 -.//&"89U3-VW9ZVU:6VY3=[ZU9WVW=6U[2[03V]U:-U99 P)"!.*$8O+&3^3*8_9'9+8I3M9'9+`-/),36)J Q9"3$888a!)8b)'8=V8=[$=$2=82W==84WYWW 8888966368S9*&90+358".8/9"!@8'3K8#*&'"8:)'-"&.' -.//&"8603[]WW]9303V000[30:0-]9=]VY=6]2ZWW P)"!.*$8O+&3^3*8_9'9+8I3M9'9+`-/),36)J Q9"3$888a!)8b)'8=V8=[$==$WY82W==84WYWW 8888-*39"368/9"!8:)'-"&.'
  • 39.
    Git Workflow –Complete • Do some work • See what you’ve changed, verify things look good: re out 781&"85"9")5 Home work: figu does 781&"86&::"..+8I:&+3'9/35J what this • Tell Git what you’re ready to commit: 781&"89668I:&+3'9/35J • Commit & log changes: 781&"8-.//&"8I:&+3'9/35J !"#$%&'(&%)$*&('*+,'-+%&./
  • 40.
  • 48.
    Branches • Question: Howcan we integrate new features without messing up our current working code? • Branches let us work in a “new directory” which we can later either delete or merge.
  • 49.
    Branches & Tags •Think of branches as separate folders, each with it’s own content and history.
  • 50.
  • 51.
    Branches & Merges •If a branch is a split in the graph, then merge is a merging of split branches • One single command (SVN users rejoice!) • Conflicts: Same code was changed in both branches • Fix by hand, re-try the merge. - !""#$%%KKK,M3*'3+,.*1%#)0%5.:"K9*3%5-/%1&"%6.-5%)53*4 /9')9+,!"/+E*35.+S&'1494/3*13 - better idea: Google “fixing a git merge conflict”
  • 52.
    Branches & Merges •Conflicts: Same code was changed in both branches • Merge fails! • Fix by hand, re-try the merge - !""#$%%KKK,M3*'3+,.*1%#)0%5.:"K9*3%5-/%1&"%6.-5%)53*4 /9')9+,!"/+E*35.+S&'1494/3*13 - better idea: Search “fixing a git merge conflict”
  • 53.
    c&"!)0,-./ git·hub /'ɡɪtˌhʌb/ GitHub isthe best way to collaborate with others. Fork, send pull requests and manage all your public and private git repositories.
  • 54.
    c&"!)0,-./ • Very easycollaboration • Clear, detailed setup instructions 4 !""#$%%!3+#,1&"!)0,-./% • Easy “forking” for Github projects - Get your own copy of their code - Contribute back with “pull requests”
  • 57.
  • 58.
    SVN integration • Veryeasy to move from SVN → Git • Works best as one-time deal, can work side-by-side • !""#$%%.*35"&5,1*%0+.1%2WWU%WU%2%1&"45S'4")".*&9+%
  • 59.
    Good Git Practice •Check in often! - Rule of thumb… check in whenever code works • Write detailed log notes! You’ll thank yourself for it later! • Branch for new features - Avoid working on the master branch, it should always be the “clean, working” code
  • 60.
    References • Pro Git - free online: ! !""#$%%#*.1&",.*1%0..M% • Branching: ! !""#$%%'S&3,-./%#.5"5%945)--355:)+41&"40*9'-!&'14/.63+% • Git tutorials and useful FAQ links: ! !""#$%%5&d*3S&5&.'5,-./%*35.)*-35%1&"4")".*&9+54031&''3*5% • Github: ! !""#$%%1&"!)0,-./% • Git-SVN integration: ! !""#$%%.*35"&5,1*%0+.1%2WWU%WU%2%1&"45S'4")".*&9+% • Google: ! !""#$%%1..1+3,-./% • Bing: ! !""#$%%0&'1,-./%
  • 61.
  • 62.
    Git Setup –one-time Recommend downloading xcode, just for the FileMerge program (“opendiff” when launched from command line) • Identify yourself to Git: 781&"8-.':&18441+.09+8)53*,'9/38He.)*8f9/3H88 781&"8-.':&18441+.09+8)53*,3/9&+8H(.)*`3/9&+,-./H8 All your work is logged using the name/email you provide here. • Give Git some color to make things easier to read: 781&"8-.':&18441+.09+8-.+.*,)&89)".8 • Line-ending bandaids: 781&"8-.':&18441+.09+8-.*3,59:3-*+:8"*)38 781&"8-.':&18441+.09+8-.*3,9)".-*+:8&'#)" “"*)3” Windows users: use “&'#)"” instead of
  • 63.
    Git Setup • Beginusing Git for a project: 78-68#*.B3-"g.+63*% 781&"8&'&" h'&"&9+&^3683/#"(8c&"8*3#.5&".*(8&'8%#*.B3-"g.+63*%,1&"% Creates the (hidden) ,1&" folder. No files being tracked yet. • Add files to repository: 781&"89668, 781&"8-.//&"84/8i:&*5"8-.//&"j Instructs Git to manage all files in the folder %#*.B3-"g.+63*%.