Egit 1.0

EGit 1.0 - Git integration in Eclipse

Software Configuration Management

Git

Egit

Take away

Further readings

Q & A

Eclipse Democamp 2011 Bucharest, Romania

Antonel Ernest Pazargic


Software Configuration ManagementTypes:Centralizedsingle point of failure

server based

bottleneck

Decentralizedany participant can act as both server and client.

disconnected operation

complete history

backups are trivial

Speed



Git HistoryBefore April 6, 2005 Linux development have been using BitKeeper (BitMover drops free license).

Linux Git was initially designed and developed by Linus Torvalds.

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

February 14, 2007 GIT 1.5.0 was released



Git InstallationLinux$ yum install git-core

$ apt-get install git-core

Mac 10.4In both Mac 10.4 and 10.5, you can install Git via MacPorts.

$ sudo port install git-core

WindowsOn Windows, installing Git is pretty easy. Simply download and install the msysGit package.



Git ComponentsWorking tree: directories, files

Repository contents: files, commits, ancestry

DAG Directed Acyclic Graph

References: Tags, Branches

HEAD: current checkout, points to branch, detached

Index (Staging area): what is to be committed



Git Basic operations:Bootstrap: init

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

Information: status, log, diff

Reference: tag, branch

Remote: clone, pull/fetch, push



Git Structure.git/config private configuration

.git/descriptiondescribe the repository

.git/info/excludeignore based on patterns

.git/objectsImmutable

Loose objects based on SHA1.

Pack files

Object: type, size & containt. Types: tree, blob, commit, tag.



Git Getting helpgit help#print the list of common commands

man git- # man page of the command (or git command --help)

git command -h #brief help



Git Hands-on. Part 1cd mydir

mkdir project

git config --global user.name "Antonel Pazargic"

git config --global user.email "[email protected]"

git init # create the .git directory

echo "Hello git" > test.txt # untracked change

git add test.txt # staged (INDEX)

git commit -m"Test"# HEAD (master). 1st commit so this commit has no parent commit.



Git Hands-on. Part 2git status # shows staged, unstaged and untracked

git diff# diffs between the index and the working files

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

git diff HEAD# diffs between HEAD and the working files

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

git show# review last commit

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

git log# see commit history

git log tag..branch# limit by range

git log HEAD~10..# limit by range



Git Hands-on. Part 3git branch -l# list branches

git branch -r # list remote branches

git tag -l # list tags

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

git tag -a -m"RC 1"# create a new tag for RC

git checkout master# switch to master branch

git merge bugfix# merge master with bugfix

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

git clone git://[email protected]/project.git# replicates remote repository (Git URLs: file://, http://, git://, ssh://)



Gitgitk



EGitOverviewEGit is a team provider for the distributed VCS Git. This tool is built on top of JGit (Java implementation of Git)



EgitInstallationPrerequisites:
Eclipse 3.7.0 Indigo, Java SE 1.4+Start Eclipse SDK

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

Work with: - http://download.eclipse.org/releases/indigo- http://download.eclipse.org/egit/updates

Use defaults, restart Workbench/Eclipse



EGitWorking with EGit


Create a repository

Configure the repository

Git repositories explorer




Share a project




Git Staging before Add operation

Package explorer NO-HEAD




Add to index

Staged changes


EgitWorking with EGit


Commit changes

Git commands


EGitHistory



EGitCompare with version in ancestor



EGitGit Preferences/Properties


Project Git Properties

Project Git Properties

Workbench Git Preferences


EGitNew and noteworthy:Synchronize ViewMergeCreate a Git repository for multiple projectsRemote operations: push, pull, clone existing projectClone repositoryWorking with Github (GitHub Connector)Mylyn integrationGit Commit Search and Commit ViewerDouble clicking a commit in the search result opens the new Commit Viewer



Further readinghttp://www.vogella.de/articles/Git/article.htmlhttp://www.vogella.de/articles/EGit/article.htmlhttp://progit.org/book/http://www.kernel.org/pub/software/scm/git/docs/gittutorial.htmlhttp://www.kernel.org/pub/software/scm/git/docs/user-manual.html

Thank you

Q & A


Muokkaa otsikon tekstimuotoa napsauttamalla

Muokkaa jsennyksen tekstimuotoa napsauttamallaToinen jsennystasoKolmas jsennystasoNeljs jsennystasoViides jsennystasoKuudes jsennystasoSeitsems jsennystasoKahdeksas jsennystasoYhdekss jsennystaso

Egit 1.0

Technology

Transcript of Egit 1.0