Basic introduction into GIT and some useful features and tools overview.

1. GIT, Beginner to Advanced Survey Rafał Rusin TouK http://touk.pl http://rrusin.blogspot.com

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)

9. Initialize repository

10. git init

11. Open GUI

12. git gui

13. Stage files for commit and create a commit

14. Commit is stored locally

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

19. Create local commits

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.

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>

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

42. git clone –bare <repo> - creates repository without working copy

43. SSH repositories

44. ssh://user@server/full-path-to-repo

45. Native GIT repositories (eg. via gitosis)

46. [email_address] :path/repo.git

47. Configuring project description

48. description, README.html, config [gitweb] owner, URL

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.

53. GitHub – social coding

54. git.apache.org, github.com/apache

55. Tools - git-scm.com

56. Who uses GIT?

57. Android, Jquery, digg.com, linux kernel, Qt, YUI

58. http://en.wikipedia.org/wiki/Git_%28software%29#Projects_using_Git