Git
Upcoming SlideShare
Loading in...5
×
 

Git

on

  • 1,434 views

My introduction presentation to Git at the DNUG User Group Koblenz in September 2011.

My introduction presentation to Git at the DNUG User Group Koblenz in September 2011.

Download the file and check the notes!

Statistics

Views

Total Views
1,434
Views on SlideShare
914
Embed Views
520

Actions

Likes
0
Downloads
32
Comments
0

5 Embeds 520

http://jthoenes.bergischweb.de 282
http://blog.jthoenes.net 214
http://feeds.feedburner.com 19
http://theoldreader.com 3
http://localhost 2

Accessibility

Categories

Upload Details

Uploaded via as Microsoft PowerPoint

Usage Rights

CC Attribution-ShareAlike LicenseCC Attribution-ShareAlike License

Report content

Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
  • Full Name Full Name Comment goes here.
    Are you sure you want to
    Your message goes here
    Processing…
Post Comment
Edit your comment

Git Git Presentation Transcript

  • GIT
    Distributed Version Control Systems
    Johannes Thönes
    johannes.thoenes@gmail.com
    DNUG Koblenz / 2011-09-21
  • Version Control Systems
    Quick VCS History
    Why Git?
    A Git Example
  • Git Workflows
    Git SVN
    GitHub
  • Version Control Systems
  • Changesets
    D
  • Revision
    BASE
    r101
    HEAD
    D
    D
  • Commit
    HEAD
    r101
    D
  • Repository
    BASE
    D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D
    r101
    r102
    r103
    r104
    r105
    HEAD
  • Working Copy
    r101
  • Branching
    trunk
    r102
    r101
    r103
    r104
    r105
  • Merge
    trunk
    r102
    r101
    r103
    r104
    r105
    r106
    experimental
  • Fork
  • Tag
    release-1.2.5
    r101
    r103
    r102
    r104
  • Quick VCS History
  • RCS
    ci
    document
    document, v
    co
  • CVS
    commit
    Repository
    WorkingCopy
    checkout
  • SVN
    commit
    Repository
    WorkingCopy
    checkout
  • Git
    commit
    push
    RemoteRepository
    LocalRepository
    WorkingCopy
    fetch/pull
    checkout
  • Git Index
    add/rm
    commit
    reset
    checkout
  • Why Git?
  • Cheap Local Branching
  • Everything is local
  • Git is Small
  • Staging Area
  • Distributed
  • Secure
  • Workflow
  • A Git Example
  • git clone
    master
    master
    stable-1.2
  • git add
    git commit
    git rm
  • git push
    git pull
  • git branch accounting_ui
    master
    accounting_ui
    git checkout accounting_ui
  • git checkout master
    git pull
    git checkout accounting_ui
    git rebase master
  • Rebase
    trunk
    experimental
    r2
    R4‘
    R5‘
    r1
    r3
    r4
    r5
    experimental
  • master
    master
    accounting_ui
    stable-1.2
    accounting_ui
    git push
  • git fetch
    master
    master
    stable-1.2
    new_accounting_ui
    accounting_ui
    git branch --tracking new_accounting_ui remotes/origin/accounting_ui
  • git remote add …
    git clone
    git push
    git pull
  • git checkout master
    git merge accounting_ui --no-ff
    git push
  • Git Workflows
  • Central
    Larry
    Sally
    BOB
  • Central
    Alice
    Larry
    Sally
  • Dictator
    LEUTENANT Module 1
    LEUTENANT Module 2
    DEV 2
    DEV 5
    DEV 4
    DEV 1
    DEV 6
    DEV 3
  • Git SVN
  • git svn clone
  • git svn init
  • git svn fetch
  • git svn rebase
  • git svn dcommit
  • git svn show-ignore >> .git/info/exclude
  • GitHub
  • Questions?
  • Online Refences
    • http://book.git-scm.com
    • http://www.kernel.org/pub/software/scm/git/docs
    • http://git.or.cz/gitwiki/FrontPage
    • http://progit.org/book
    • http://whygitisbetterthanx.com
    Windows Clients
    • msysGit - http://code.google.com/p/msysgit
    • SmartGit - http://www.syntevo.com/smartgit
    • TortoiseGit - http://code.google.com/p/tortoisegit
    References
  • Thank you
  • Appendix
  • The Speaker
    Johannes Thönes
    Software Trainer at
    CompuGroup Medical Software
    Johannes.thoenes@gmail.comhttp://jthoenes.bergischweb.de
    jthoenes
  • Images
    Cheap Local Branching http://www.flickr.com/photos/calliope/5664674040
    Everything is Localhttp://www.flickr.com/photos/downhilldom1984/6034381675
    Git is Small http://www.flickr.com/photos/mullica/5676120685
    Staging Area http://www.flickr.com/photos/96dpi/2589006785
    Distributed http://www.flickr.com/photos/uqbar/114320354
    Secure http://www.flickr.com/photos/carlosluzz/561920999
    Workflow http://www.flickr.com/photos/cblue98/5115058146
    Questions http://www.flickr.com/photos/t3rmin4t0r/2365831019
    Thank Youhttp://en.wikipedia.org/wiki/File:Leonard_Nimoy_by_Gage_Skidmore_2.jpg
  • License
    This presentation can be re-used under the terms of: Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
    See: http://creativecommons.org/licenses/by-sa/3.0/