EGit - Git integration in Eclipse Indigo

2. Git

3. Egit

4. Take away

5. Further readings

6. Q & A Eclipse Democamp 2011 Bucharest, Romania Antonel Ernest Pazargic

8. server based

10. disconnected operation

11. complete history

12. backups are trivial

13. Speed Eclipse Democamp 2011 Bucharest, Romania

15. Linux Git was initially designed and developed by Linus Torvalds.

16. Since June 16, 2005 the entire Linux kernel is developed using the Git distributed SCM.

17. February 14, 2007 GIT 1.5.0 was released Eclipse Democamp 2011 Bucharest, Romania

22. Repository contents: files, commits, ancestry

23. DAG Directed Acyclic Graph

24. References: Tags, Branches

25. HEAD: current checkout, points to branch, detached

26. Index (Staging area): what is to be committed Eclipse Democamp 2011 Bucharest, Romania

28. Modify: add, delete(rm), rename(mv), commit

29. Information: status, log, diff

30. Reference: tag, branch

31. Remote: clone, pull/fetch, push Eclipse Democamp 2011 Bucharest, Romania

33. .git/description describe the repository

34. .git/info/exclude ignore based on patterns

36. Loose objects based on SHA1.

37. Pack files

38. Object: type, size & containt. Types: tree, blob, commit, tag. Eclipse Democamp 2011 Bucharest, Romania

40. man git-<command> # man page of the command (or git command --help)

41. git command -h #brief help Eclipse Democamp 2011 Bucharest, Romania

43. mkdir project

44. git config --global user.name &quot;Antonel Pazargic&quot;

45. git config --global user.email &quot;a.b@xxxxxx.com&quot;

46. git init # create the .git directory

47. echo &quot;Hello git&quot; > test.txt # untracked change

48. git add test.txt # staged (INDEX)

49. git commit -m&quot;Test&quot; # HEAD (master). 1st commit so this commit has no parent commit. Eclipse Democamp 2011 Bucharest, Romania

51. git diff # diffs between the index and the working files

52. git diff $commit1 $commit2 # diffs between two commits (commit could be specified by full/short hash, tag, branch, remote branch)

53. git diff HEAD # diffs between HEAD and the working files

54. git diff --staged # diffs between HEAD and the index

55. git show # review last commit

56. git show HEAD~3 # ~, ^ special characters to identify a certain

57. git log # see commit history

58. git log tag..branch # limit by range

59. git log HEAD~10.. # limit by range Eclipse Democamp 2011 Bucharest, Romania

61. git branch -r # list remote branches

62. git tag -l # list tags

63. git checkpout -b bugfix # checkout the current branch and create/switch to a new branch named bugfix

64. git tag -a -m&quot;RC 1&quot; # create a new tag for RC

65. git checkout master # switch to master branch

66. git merge bugfix # merge master with bugfix

67. git merge $One $Two # octopus merging. Merging master with One and Two

68. Remote

69. git clone git://jtonic@repo.com/project.git # replicates remote repository (Git URLs: file://, http://, git://, ssh://) Eclipse Democamp 2011 Bucharest, Romania

72. EGit is a team provider for the distributed VCS Git. This tool is built on top of JGit (Java implementation of Git) Eclipse Democamp 2011 Bucharest, Romania

74. Install EGit using Eclipse Update Manager Help>Install New Software...>

75. Work with:

76. - http://download.eclipse.org/releases/indigo

77. - http://download.eclipse.org/egit/updates

78. Use defaults, restart Workbench/Eclipse Eclipse Democamp 2011 Bucharest, Romania

89. http://www.vogella.de/articles/Git/article.html

90. http://www.vogella.de/articles/EGit/article.html

91. http://progit.org/book/

92. http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html

93. http://www.kernel.org/pub/software/scm/git/docs/user-manual.html

94. Thank you

95. Q & A Eclipse Democamp 2011 Bucharest, Romania