Git, Beginner to Advanced Survey
3 likes1,416 views
GIT is a distributed version control system that is designed for speed, branching and merging. Unlike centralized systems like SVN, GIT allows developers to work on local copies of a repository and merge changes later. It uses a 3-way merge algorithm to resolve conflicts when merging branches. Common GIT commands include git log to view history, git checkout to switch branches, and git commit to commit changes locally before pushing to a remote repository.
Git, Beginner to Advanced Survey
- 1. GIT, Beginner to Advanced Survey Rafał Rusin TouK http://touk.pl http://rrusin.blogspot.com
- 2. What is GIT? Global Information Tracker when it works "goddamn idiotic truckload of sh*t": when it breaks
- 3. Distributed Version Control System Unlike SVN, which is centralized
- 4. Designed for speed git log, git checkout <branch>, git blame – are done locally
- 5. Designed for branching and merging Includes tuned 3 way merge algorithm for resolving conflicts, with handling merges including file renames.
- 6. Works on data, not on file names (hashes)
- 7. GIT has Distributed Model Centralized & Distributed model as asdf
- 8. Getting Started Configuring GIT Create a file ~/.gitconfig and set up user name and email – this info may be distributed globally
- 10. git init
- 11. Open GUI
- 12. git gui
- 13. Stage files for commit and create a commit
- 14. Commit is stored locally
- 15. Connecting to External World Cloning remote repository
- 16. git clone [email_address] :rafalrusin/ode-scripts.git (example)
- 17. There is support for protocols, like ssh and file:
- 18. git clone ../other-dir, git clone ssh://user@host/full-path-to-project
- 20. Push to remote repository
- 21. git gui / remote / push
- 22. Note: It may fail due to not merged newest remote commits. You will need to do fetch, merge and push again.
- 23. Working with Branches GIT is usable for maintaining forks
- 24. Merging to latest upstream release is easy
- 25. Creating a branch from current HEAD
- 26. git checkout -b NAME
- 27. Merging other branch into HEAD
- 28. git merge NAME
- 29. If a confict occurs, use git mergetool (like meld)
- 30. Rebasing a set of commits onto other head
- 31. git rebase –onto OTHER_HEAD <starting-from-commit>
- 32. Advanced Commands Git cherry-pick – merge single commit into current HEAD
- 33. Git stash – store local changes to work on other branch
- 34. Amend last commit – update last commit by new changeset
- 35. Git grep – lookup data over indexed files only
- 36. Git blame – provides author and revision for each line of file
- 37. Git submodules – similar to svn:externals, adds possibility of joining different projects into one http://speirs.org/blog/2009/5/11/understanding-git-submodules.html
- 38. Git apply –index <a.patch> - applies a patch and stages it in index
- 39. Git show <commit> - show a diff for commit
- 40. Git reset –hard, git checkout-index -f <a.file> - drop local changes
- 41. Publishing Code With GitWeb Bare repositories
- 42. git clone –bare <repo> - creates repository without working copy
- 43. SSH repositories
- 45. Native GIT repositories (eg. via gitosis)
- 48. description, README.html, config [gitweb] owner, URL
- 49. Integrating With Hudson Hudson Continous Integration has GIT support
- 50. CI builds using GIT have advantage
- 51. You can set up Hudson to build multiple branches. Then developers may submit their forked branch to see if they work passes tests. Then if it's OK, they can merge to master. This way you won't have unstable commits in master branch.
- 52. References Running GIT under Windows (msysgit) http://nathanj.github.com/gitguide/index.html - also explains features of git gui
- 53. GitHub – social coding
- 56. Who uses GIT?
- 57. Android, Jquery, digg.com, linux kernel, Qt, YUI