Intro to git-svn

This is an intro presentation on using Git. The focus is on using Git to connect to a subversion repository to share changes via git-svn.

Transcript

1. git-svn +
2. • About Git • git-svn Setup • Simple Workflow • Advanced Commands Agenda
3. Distributed Version Control System
4. Centralized
5. Distributed
6. Distributed
7. http://programmers.stackexchange.com/questions/35074/im-a-subversion- geek-why-should-i-consider-or-not-consider-mercurial-or-git-or Large Project Workflow
8. Lightweight Branching
9. • Frictionless Context Switching • Role-Based Code lines • Feature Based Workflow • Disposable Experimentation
10. Git File Lifecycle
11. git svn
12. Git-svn is a feature that ships with Git that allows Git to connect to a subversion repository and share changes. Using git-svn is one way to learn how to use Git while still maintaining a Subversion repository.
13. Basic Commands #add contents to the next commit git add #show the working tree status git status #record changes to the repository git commit #show commit log git log
14. A Simple Example #pull recent changes from svn git svn rebase #add a file touch my-file.txt #add changes to staging area git add my-file.txt #commit staged changes git commit -m "made some changes“ #share changes with svn git svn dcommit
15. Sharing Changes w/ Subversion #get updates from svn git svn rebase #commit all local git commits to svn git svn dcommit
16. Sharing Changes #get new changes from external repository git fetch #fetch + merge git pull #write new changes to external repository git push
17. Branching #create/modify/delete branches git branch #switch working dir to another branch/commit git checkout #merge two or more branches git merge #changes starting point of a branch git rebase #set a branch back to HEAD git reset
18. Git svn Workflow #work on a local branch or branches git checkout -b myfeature #make some changes and commit git commit -a -m "made some changes“ #switch to master and rebase changes git checkout master git rebase myfeature git svn rebase #commit changes to svn git svn dcommit
19. http://git-scm.com/book
20. http://try.github.com/levels/1/challenges/1