Your SlideShare is downloading. ×
0
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Cheltenham Geeks - git talk/interactive session
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Cheltenham Geeks - git talk/interactive session

105

Published on

Presentation about the git source control system given to the Cheltenham Geeks group. This formed part of a longer interactive session in which the group followed along.

Presentation about the git source control system given to the Cheltenham Geeks group. This formed part of a longer interactive session in which the group followed along.

Published in: Technology, Business
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
105
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
1
Comments
0
Likes
0
Embeds 0
No embeds

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

  • 1. git commit -m “Cheltenham Geeks” Introduction to version control using git
  • 2. Getting started • git --version • git --help • git <command> --help
  • 3. Configuration • git config --global user.name "bob" • git config --global user.email bob@bob.com • git config --global core.editor vi • git config --global color.ui true
  • 4. Staging Repository Stage Working Copy add / rmcommit checkout
  • 5. After first commit on branch Initial commit Branch commit master branch
  • 6. After commit on master Initial commit master branch
  • 7. What is HEAD in git? Initial commit master branch HEAD After "git checkout master"
  • 8. What is HEAD in git? Initial commit master branch HEADAfter "git checkout branch"
  • 9. After merge from branch Initial commit master branch
  • 10. After deleting branch Initial commit master
  • 11. Fast forward merges Initial commit Branch commit master branch Branch commit
  • 12. Fast forward merges Initial commit Branch commit master branch Branch commit
  • 13. Rebase vs Merge Initial commit master branch
  • 14. Rebase Initial commit master branch patch re-applied
  • 15. Rebase Initial commit master branch
  • 16. Branching in centralised version control systems • This is an example from my current work project (using TFS) • release • release 0.1.0.0 • branch • asteroid • sputnik • meteor • cosmicdebris • main • Making and maintaining branches is expensive so they are created and setup and never changed
  • 17. Branching in git • Branching is fast • Switching between branches is fast • Branches can be thrown away easily • Different workflows are possible • Create, work on, merge, delete many branches in a single day
  • 18. DistributedVersion Control Source: Eric Sink’sVersion Control by Example
  • 19. Distributed version control • Integration manager workflow Source: Pro Git (Scott Charon)
  • 20. Distributed version control • Dictator and lieutenant workflow Source: Pro Git (Scott Charon)
  • 21. Other topics • Git hooks • Stashing • Patches
  • 22. Further reading • Version Control By Example (Eric Sink) • http://www.ericsink.com/vcbe/html/ index.html • Pro Git (Scott Chacon) • http://git-scm.com/book

×