Download as PDF, PPTX
Uploaded byAndrzej Grzesik
Git
Git is a distributed, open source version control system that is fast, reliable, powerful and popular. It provides advantages over Subversion like cherry-picking, rebasing, and submodules. Git commits provide detailed information that can be exposed via APIs and plugins like the maven-git-commit-id-plugin. Tools exist to host and manage git repositories, including Gitweb for viewing repositories, Gitosis for basic access control, and Gerrit for online code reviews.
More Related Content
Git
- 1. git Andrzej Grzesik Konrad Malawski LunarLogicPolska
- 2. Andrzej Grzesik past
- 3.
- 4.
- 5. intro a distributed open source version control system
- 6. intro is also fast reliable powerful popular
- 7.
- 8. still, “git go away” • it is too new • not tested • does not provide backups (sic!) • does not like windows • does not support ... • it's not subversion
- 9. git is not subversion! Git is "simple" but hard. Subversion is "easy", but eventually complex. Thomas Nicolaisen (http://blog.tfnico.com/2011/11/some-thoughts-on-git-vs-complexity.html)
- 10. basics ! git config --globaluser.name Sheldon Cooper! git config --global user.email bazinga@bigbang.com! git config --global color.ui true!
- 11.
- 12.
- 13. way beDer than svn • cherry-pick • rebase (interactive) • interactive add • submodules • git svn • git sh
- 14.
- 15.
- 16.
- 17.
- 18. adding submodule # initializea submodule git submodule add git://llp.pl/common.git common # initial pull of it's contents git submodule init # pull pointed to commit (and overwrite your changes) git submodule update
- 19.
- 20. updating a submodule cdcommon git pull cd .. # Warning! Add the dir without trailing "/” git add common git commit -m "Latest common submodule commit"
- 21.
- 22. what does the log show?
- 23. git rebase ... or"Why merge isn't enough?"
- 24.
- 25.
- 26.
- 27.
- 28.
- 29.
- 30.
- 31.
- 32. git commit idmaven plugin https://github.com/ktoso/maven-git-commit-id-plugin
- 33. git commit idmaven plugin Keeping commit info in UI of the running app, results in better (or less!) bug reports :-)
- 34. git commit idmaven plugin Or expose full details, for developers only @Inject GitRepositoryState repoState; @GET @Path("/git") public GitRepositoryState getRepoState() { return repoState; } { "branch" : "testing-maven-git-plugin", "commitTime" : "06.01.1970 @ 16:16:26 CET", "commitId" : "787e39f61f99110e74deed68ab9093088d64b969", "commitIdAbbrev" : "787e39f", "commitUserName" : "Konrad Malawski", "commitUserEmail" : "konrad.malawski@java.pl", "commitMessageFull" : "releasing my fun plugin :-) + fixed some typos + cleaned up directory structure + added license etc", "commitMessageShort" : "releasing my fun plugin :-)", "buildTime" : "06.01.1970 @ 16:17:53 CET", "buildUserName" : "Konrad Malawski", "buildUserEmail" : "konrad.malawski@java.pl" }
- 35.
- 36. gitweb De facto standardof viewing git-based repositories Just point it to the repo Works through Apache and CGI
- 37. gitosis simple, read/write permissions per-repository ssh-keybased authentication but it's trivial to expose config file via f.ex. Grails frontend
- 38. gerrit online code review (likeReviewBoard, but better ;-)) also hosts git repositories review commits before they enter a branch
- 39. gerrit with somehelp by the power of Jenkins, allows to have pre-tested commits
- 40.
- 41.
- 42. resources Git immersion: http://library.edgecase.com/git_immersion/index.html On branchingwith Git http://nvie.com/posts/a-successful-git-branching-model/ Pro Git book (creative commons) www.progit.org Git-scm.com Git.wiki.kernel.org